Remove apex policy editor gui

The apex policy editor has been moved to policy-gui. This review removes
the code from the apex-pdp repo.

Issue-ID: POLICY-2621
Change-Id: Ib5b90386d0da8af6eec8870fbcaf01b94975d5c6
Signed-off-by: liamfallon <liam.fallon@est.tech>

518 files changed, 0 insertions, 52310 deletions

diff --git a/client/client-editor/pom.xml b/client/client-editor/pom.xml
deleted file mode 100644
index 4a5dcb474..000000000
--- a/client/client-editor/pom.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2019-2020 Nordix Foundation.
-   Modifications Copyright (C) 2020 Bell Canada.
-  ================================================================================
-  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.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-<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>
-    <parent>
-        <groupId>org.onap.policy.apex-pdp.client</groupId>
-        <artifactId>apex-client</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>apex-client-editor</artifactId>
-    <name>${project.artifactId}</name>
-    <description>Web client for editing Apex policies</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.common</groupId>
-            <artifactId>policy-endpoints</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.onap.aaf.authz</groupId>
-                    <artifactId>aaf-cadi-aaf</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.att.nsa</groupId>
-                    <artifactId>cambriaClient</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
-                    <artifactId>dmaapClient</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.common</groupId>
-            <artifactId>utils</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.worldturner.medeia</groupId>
-                    <artifactId>medeia-validator-gson</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>model-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.core</groupId>
-            <artifactId>core-infrastructure</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-grizzly2-http</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-moxy</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>org.eclipse.persistence.moxy</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
-            <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>apex-client-common</artifactId>
-            <version>${project.version}</version>
-            <classifier>resources</classifier>
-            <type>zip</type>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <outputDirectory>${project.build.directory}/classes</outputDirectory>
-        <plugins>
-
-<!-- https://blog.sonatype.com/2008/04/how-to-share-resources-across-projects-in-maven/ -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-shared-resources</id>
-                        <goals>
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory>
-       <!--use as much as needed to be specific...also scope,type,classifier etc-->
-                            <includeArtifacIds>apex-client-common</includeArtifacIds>
-                            <includeGroupIds>org.onap.policy.apex-pdp.client</includeGroupIds>
-                            <excludeTransitive>true</excludeTransitive>
-                            <excludeTransitive>true</excludeTransitive>
-                            <excludeTypes>jar</excludeTypes>
-                            <includeTypes>zip</includeTypes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- Editor's css overrides common css -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <overwrite>true</overwrite>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>make shared resources</id>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/resources.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/client/client-editor/src/main/assembly/resources.xml b/client/client-editor/src/main/assembly/resources.xml
deleted file mode 100644
index 0205c3d5d..000000000
--- a/client/client-editor/src/main/assembly/resources.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 Ericsson. All rights reserved.
-  ================================================================================
-  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.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-<assembly>
-    <id>resources</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>target/classes/webapp</directory>
-            <outputDirectory>editor</outputDirectory>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditor.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditor.java
deleted file mode 100644
index 20bd6c488..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditor.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest;
-
-import org.glassfish.grizzly.http.server.HttpServer;
-import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.onap.policy.common.utils.validation.Assertions;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * This class is used to launch the editor. It creates a Grizzly embedded web server and runs the editor.
- */
-public class ApexEditor {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ApexEditor.class);
-
-    // The HTTP server exposing JAX-RS resources defined in this application.
-    private final HttpServer server;
-
-    /**
-     * Starts the HTTP server for the Apex editor on the default base URI and with the default REST packages.
-     */
-    public ApexEditor() {
-        this(new ApexEditorParameters());
-    }
-
-    /**
-     * Starts the HTTP server for the Apex editor.
-     *
-     * @param parameters the parameters
-     */
-    public ApexEditor(final ApexEditorParameters parameters) {
-        Assertions.argumentNotNull(parameters, "parameters may not be null");
-
-        LOGGER.debug("Apex RESTful editor starting . . .");
-
-        // Create a resource configuration that scans for JAX-RS resources and providers
-        // in org.onap.policy.apex.client.editor.rest package
-        final ResourceConfig rc = new ResourceConfig().packages(parameters.getRestPackages());
-
-        // create and start a new instance of grizzly http server
-        // exposing the Jersey application at BASE_URI
-        server = GrizzlyHttpServerFactory.createHttpServer(parameters.getBaseUri(), rc);
-
-        // Add static content
-        server.getServerConfiguration().addHttpHandler(new org.glassfish.grizzly.http.server.CLStaticHttpHandler(
-                ApexEditorMain.class.getClassLoader(), "/webapp/"), parameters.getStaticPath());
-
-        LOGGER.debug("Apex RESTful editor started");
-    }
-
-    /**
-     * Shut down the web server.
-     */
-    public void shutdown() {
-        LOGGER.debug("Apex RESTful editor shutting down . . .");
-        server.shutdown();
-        LOGGER.debug("Apex RESTful editor shut down");
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorException.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorException.java
deleted file mode 100644
index 18dcc9f99..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorException.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest;
-
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-
-/**
- * Exceptions from the Apex editor.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ApexEditorException extends ApexException {
-    private static final long serialVersionUID = 4867385591967018254L;
-
-    /**
-     * Instantiates a new apex editor exception.
-     *
-     * @param message the message on the exception
-     */
-    public ApexEditorException(final String message) {
-        super(message);
-    }
-
-    /**
-     * Instantiates a new apex editor exception.
-     *
-     * @param message the message on the exception
-     * @param object the object that the exception was thrown on
-     */
-    public ApexEditorException(final String message, final Object object) {
-        super(message, object);
-    }
-
-    /**
-     * Instantiates a new apex editor exception.
-     *
-     * @param message the message on the exception
-     * @param ex the exception that caused this Apex exception
-     */
-    public ApexEditorException(final String message, final Exception ex) {
-        super(message, ex);
-    }
-
-    /**
-     * Instantiates a new apex editor exception.
-     *
-     * @param message the message on the exception
-     * @param ex the exception that caused this Apex exception
-     * @param object the object that the exception was thrown on
-     */
-    public ApexEditorException(final String message, final Exception ex, final Object object) {
-        super(message, ex, object);
-    }
-
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorMain.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorMain.java
deleted file mode 100644
index 3f728827e..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorMain.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest;
-
-import java.io.PrintStream;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * This class is the main class that is used to launch the Apex editor from the command line.
- *
- */
-public class ApexEditorMain {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ApexEditorMain.class);
-
-    // Recurring string constants
-    private static final String REST_ENDPOINT_PREFIX = "Apex Editor REST endpoint (";
-
-    /**
-     * The Enum EditorState holds the current state of the editor.
-     */
-    // Editor state
-    public enum EditorState {
-        /** The editor is stopped. */
-        STOPPED,
-        /** The editor is ready to run. */
-        READY,
-        /** The editor is getting ready to run. */
-        INITIALIZING,
-        /** The editor is running. */
-        RUNNING
-    }
-
-    private static final int EDITOR_RNNING_CHECK_TIMEOUT = 1000;
-
-    private EditorState state = EditorState.STOPPED;
-
-    // The Apex editor this class is running
-    private ApexEditor apexEditor = null;
-
-    // The parameters for the editor
-    private ApexEditorParameters parameters = null;
-
-    // Output and error streams for messages
-    private final PrintStream outStream;
-
-    /**
-     * Constructor, kicks off the editor.
-     *
-     * @param args The command line arguments for the editor
-     * @param outStream The stream for output messages
-     */
-    public ApexEditorMain(final String[] args, final PrintStream outStream) {
-        // Save the streams for output and error
-        this.outStream = outStream;
-
-        // Editor parameter parsing
-        final ApexEditorParameterParser parser = new ApexEditorParameterParser();
-
-        try {
-            // Get and check the parameters
-            parameters = parser.parse(args);
-        } catch (final ApexEditorParameterException e) {
-            throw new ApexEditorParameterException(REST_ENDPOINT_PREFIX + this.toString() + ") parameter error, "
-                            + e.getMessage() + '\n' + parser.getHelp(ApexEditorMain.class.getName()), e);
-        }
-
-        if (parameters.isHelpSet()) {
-            throw new ApexEditorParameterException(parser.getHelp(ApexEditorMain.class.getName()));
-        }
-
-        // Validate the parameters
-        final String validationMessage = parameters.validate();
-        if (validationMessage.length() > 0) {
-            throw new ApexEditorParameterException(REST_ENDPOINT_PREFIX + this.toString() + ") parameters invalid, "
-                            + validationMessage + '\n' + parser.getHelp(ApexEditorMain.class.getName()));
-        }
-
-        state = EditorState.READY;
-    }
-
-    /**
-     * Initialize the Apex editor.
-     */
-    public void init() {
-        outStream.println(REST_ENDPOINT_PREFIX + this.toString() + ") starting at " + parameters.getBaseUri().toString()
-                        + " . . .");
-
-        try {
-            state = EditorState.INITIALIZING;
-
-            // Start the editor
-            apexEditor = new ApexEditor(parameters);
-
-            // Add a shutdown hook to shut down the editor when the process is exiting
-            Runtime.getRuntime().addShutdownHook(new Thread(new ApexEditorShutdownHook()));
-
-            state = EditorState.RUNNING;
-
-            if (parameters.getTimeToLive() == ApexEditorParameters.INFINITY_TIME_TO_LIVE) {
-                outStream.println(REST_ENDPOINT_PREFIX + this.toString() + ") started at "
-                                + parameters.getBaseUri().toString());
-            } else {
-                outStream.println(REST_ENDPOINT_PREFIX + this.toString() + ") started");
-            }
-
-            // Find out how long is left to wait
-            long timeRemaining = parameters.getTimeToLive();
-            while (timeRemaining == ApexEditorParameters.INFINITY_TIME_TO_LIVE || timeRemaining > 0) {
-                // decrement the time to live in the non-infinity case
-                if (timeRemaining > 0) {
-                    timeRemaining--;
-                }
-
-                // Wait for a second
-                Thread.sleep(EDITOR_RNNING_CHECK_TIMEOUT);
-            }
-        } catch (final Exception e) {
-            String message = REST_ENDPOINT_PREFIX + this.toString() + ") failed at with error: " + e.getMessage();
-            outStream.println(message);
-            LOGGER.warn(message, e);
-        } finally {
-            if (apexEditor != null) {
-                apexEditor.shutdown();
-                apexEditor = null;
-            }
-            state = EditorState.STOPPED;
-        }
-    }
-
-    /**
-     * Get the editor state.
-     *
-     * @return the state
-     */
-    public EditorState getState() {
-        return state;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        final StringBuilder ret = new StringBuilder();
-        ret.append(this.getClass().getSimpleName()).append(": Config=[").append(parameters).append("], State=")
-                        .append(this.getState());
-        return ret.toString();
-    }
-
-    /**
-     * Explicitly shut down the editor.
-     */
-    public void shutdown() {
-        if (apexEditor != null) {
-            outStream.println(REST_ENDPOINT_PREFIX + this.toString() + ") shutting down");
-            apexEditor.shutdown();
-        }
-        state = EditorState.STOPPED;
-        outStream.println(REST_ENDPOINT_PREFIX + this.toString() + ") shut down");
-    }
-
-    /**
-     * This class is a shutdown hook for the Apex editor command.
-     */
-    private class ApexEditorShutdownHook implements Runnable {
-        /**
-         * {@inheritDoc}.
-         */
-        @Override
-        public void run() {
-            if (apexEditor != null) {
-                apexEditor.shutdown();
-            }
-        }
-    }
-
-    /**
-     * Main method, main entry point for command.
-     *
-     * @param args The command line arguments for the editor
-     */
-    public static void main(final String[] args) {
-        try {
-            final ApexEditorMain editorMain = new ApexEditorMain(args, System.out);
-            editorMain.init();
-        } catch (final Exception e) {
-            LOGGER.error("start failed", e);
-        }
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameterException.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameterException.java
deleted file mode 100644
index 0ba12dec6..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameterException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest;
-
-/**
- * A run time exception used to report parsing and parameter input errors.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ApexEditorParameterException extends IllegalArgumentException {
-    private static final long serialVersionUID = 6520231162404452427L;
-
-    /**
-     * Create an ApexEditorParameterException with a message.
-     *
-     * @param message the message
-     */
-    public ApexEditorParameterException(final String message) {
-        super(message);
-    }
-
-    /**
-     * Create an ApexEditorParameterException with a message and an exception.
-     *
-     * @param message the message
-     * @param th the Throwable instance
-     */
-    public ApexEditorParameterException(final String message, final Throwable th) {
-        super(message, th);
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameterParser.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameterParser.java
deleted file mode 100644
index ef89945aa..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameterParser.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Arrays;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-
-/**
- * This class reads and handles command line parameters to the Apex CLI editor.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ApexEditorParameterParser {
-    // Apache Commons CLI options
-    private Options options;
-
-    private static final int COMMAND_HELP_MAX_LINE_WIDTH = 120;
-
-    /**
-     * Construct the options for the CLI editor.
-     */
-    public ApexEditorParameterParser() {
-        options = new Options();
-        options.addOption("h", "help", false, "outputs the usage of this command");
-        options.addOption(
-                Option.builder("p").longOpt("port").desc("port to use for the Apex RESTful editor REST calls.").hasArg()
-                        .argName("PORT").required(false).type(Number.class).build());
-        options.addOption(Option.builder("t").longOpt("time-to-live")
-                .desc("the amount of time in seconds that the server will run for before terminating. "
-                        + "Default value is " + ApexEditorParameters.INFINITY_TIME_TO_LIVE + " to run indefinitely.")
-                .hasArg().argName("TIME_TO_LIVE").required(false).type(Number.class).build());
-        options.addOption(Option.builder("l").longOpt("listen")
-                .desc("the IP address to listen on.  Default value is " + ApexEditorParameters.DEFAULT_SERVER_URI_ROOT
-                        + " to restrict access to the local machine only.")
-                .hasArg().argName("ADDRESS").required(false).type(String.class).build());
-    }
-
-    /**
-     * Parse the command line options.
-     *
-     * @param args The arguments
-     * @return the apex editor parameters
-     */
-    public ApexEditorParameters parse(final String[] args) {
-        CommandLine commandLine = null;
-        try {
-            commandLine = new DefaultParser().parse(options, args);
-        } catch (final ParseException e) {
-            throw new ApexEditorParameterException("invalid command line arguments specified : " + e.getMessage());
-        }
-
-        final ApexEditorParameters parameters = new ApexEditorParameters();
-        final String[] remainingArgs = commandLine.getArgs();
-
-        if (commandLine.getArgs().length > 0) {
-            throw new ApexEditorParameterException(
-                    "too many command line arguments specified : " + Arrays.toString(remainingArgs));
-        }
-
-        if (commandLine.hasOption('h')) {
-            parameters.setHelp(true);
-        }
-        try {
-            if (commandLine.hasOption('p')) {
-                parameters.setRestPort(((Number) commandLine.getParsedOptionValue("port")).intValue());
-            }
-        } catch (final ParseException e) {
-            throw new ApexEditorParameterException("error parsing argument \"port\" :" + e.getMessage(), e);
-        }
-        try {
-            if (commandLine.hasOption('t')) {
-                parameters.setTimeToLive(((Number) commandLine.getParsedOptionValue("time-to-live")).longValue());
-            }
-        } catch (final ParseException e) {
-            throw new ApexEditorParameterException("error parsing argument \"time-to-live\" :" + e.getMessage(), e);
-        }
-        try {
-            if (commandLine.hasOption('l')) {
-                parameters.setListenAddress(commandLine.getParsedOptionValue("listen").toString());
-            }
-        } catch (final ParseException e) {
-            throw new ApexEditorParameterException("error parsing argument \"listen-address\" :" + e.getMessage(), e);
-        }
-
-        return parameters;
-    }
-
-    /**
-     * Get help information.
-     *
-     * @param mainClassName the main class name
-     * @return the help
-     */
-    public String getHelp(final String mainClassName) {
-        final StringWriter stringWriter = new StringWriter();
-        final PrintWriter stringPrintWriter = new PrintWriter(stringWriter);
-
-        final HelpFormatter helpFormatter = new HelpFormatter();
-        helpFormatter.printHelp(stringPrintWriter, COMMAND_HELP_MAX_LINE_WIDTH, mainClassName + " [options...] ", null,
-                options, 0, 1, "");
-
-        return stringWriter.toString();
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameters.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameters.java
deleted file mode 100644
index 1687c01e0..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/ApexEditorParameters.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * This class reads and handles command line parameters to the Apex CLI editor.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ApexEditorParameters {
-    // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ApexEditorParameters.class);
-
-    /** The default port for connecting to the Web editor on. */
-    public static final int DEFAULT_REST_PORT = 18989;
-
-    /** The connection is held up until killed on demand. */
-    public static final int INFINITY_TIME_TO_LIVE = -1;
-
-    // Base URI the HTTP server will listen on
-    private static final String DEFAULT_SERVER_URI_PREFIX = "http://";
-    /** The server listens on localhost by default. */
-    public static final String DEFAULT_SERVER_URI_ROOT = "localhost";
-    private static final String DEFAULT_REST_PATH = "/apexservices/";
-    private static final String DEFAULT_STATIC_PATH = "/";
-
-    // Constants for port checks
-    private static final int MIN_USER_PORT = 1024;
-    private static final int MAX_USER_PORT = 65535;
-
-
-    // Package that will field REST requests
-    private static final String[] DEFAULT_PACKAGES = new String[] { "org.onap.policy.apex.client.editor.rest" };
-
-    // The editor parameters
-    private boolean helpSet = false;
-    private int restPort = DEFAULT_REST_PORT;
-    private long timeToLive = INFINITY_TIME_TO_LIVE;
-    private String listenAddress = DEFAULT_SERVER_URI_ROOT;
-
-    /**
-     * Validate.
-     *
-     * @return the string
-     */
-    public String validate() {
-        String validationMessage = "";
-        validationMessage += validatePort();
-        validationMessage += validateTimeToLive();
-        validationMessage += validateUrl();
-
-        return validationMessage;
-    }
-
-    /**
-     * Gets the base URI.
-     *
-     * @return the base URI
-     */
-    public URI getBaseUri() {
-        return URI.create(DEFAULT_SERVER_URI_PREFIX + listenAddress + ':' + restPort + DEFAULT_REST_PATH);
-    }
-
-    /**
-     * Gets the REST packages.
-     *
-     * @return the REST packages
-     */
-    public String[] getRestPackages() {
-        return DEFAULT_PACKAGES;
-    }
-
-    /**
-     * Gets the static path.
-     *
-     * @return the static path
-     */
-    public String getStaticPath() {
-        return DEFAULT_STATIC_PATH;
-    }
-
-    /**
-     * Validate port.
-     *
-     * @return a warning string, or an empty string
-     */
-    private String validatePort() {
-        if (restPort < MIN_USER_PORT || restPort > MAX_USER_PORT) {
-            return "port must be between " + MIN_USER_PORT + " and " + MAX_USER_PORT + "\n";
-        } else {
-            return "";
-        }
-    }
-
-    /**
-     * Validate URL.
-     *
-     * @return a warning string, or an empty string
-     */
-    private String validateUrl() {
-        try {
-            new URI(getBaseUri().toString()).parseServerAuthority();
-            return "";
-        } catch (final URISyntaxException e) {
-            String message = "listen address is not valid. " + e.getMessage() + "\n";
-            LOGGER.warn(message, e);
-            return message;
-        }
-    }
-
-    /**
-     * Validate time to live.
-     *
-     * @return the string
-     */
-    private String validateTimeToLive() {
-        if (timeToLive < -1) {
-            return "time to live must be greater than -1 (set to -1 to wait forever)\n";
-        } else {
-            return "";
-        }
-    }
-
-    /**
-     * Checks if is help set.
-     *
-     * @return true, if checks if is help set
-     */
-    public boolean isHelpSet() {
-        return helpSet;
-    }
-
-    /**
-     * Sets the help.
-     *
-     * @param help the help
-     */
-    public void setHelp(final boolean help) {
-        this.helpSet = help;
-    }
-
-    /**
-     * Gets the REST port.
-     *
-     * @return the REST port
-     */
-    public int getRestPort() {
-        return restPort;
-    }
-
-    /**
-     * Sets the REST port.
-     *
-     * @param incomingRestPort the REST port
-     */
-    public void setRestPort(final int incomingRestPort) {
-        this.restPort = incomingRestPort;
-    }
-
-    /**
-     * Gets the time to live.
-     *
-     * @return the time to live
-     */
-    public long getTimeToLive() {
-        return timeToLive;
-    }
-
-    /**
-     * Sets the time to live.
-     *
-     * @param timeToLive the time to live
-     */
-    public void setTimeToLive(final long timeToLive) {
-        this.timeToLive = timeToLive;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        final StringBuilder ret = new StringBuilder();
-        ret.append(this.getClass().getSimpleName()).append(": URI=").append(this.getBaseUri()).append(", TTL=")
-                .append(this.getTimeToLive()).append("sec");
-        return ret.toString();
-    }
-
-    /**
-     * Gets the base address to listen on.
-     *
-     * @return the listenAddress
-     */
-    public String getListenAddress() {
-        return listenAddress;
-    }
-
-    /**
-     * Sets the base address to listen on.
-     *
-     * @param listenAddress the new listenAddress
-     */
-    public void setListenAddress(final String listenAddress) {
-        this.listenAddress = listenAddress;
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResource.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResource.java
deleted file mode 100644
index 9c3a3de26..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResource.java
+++ /dev/null
@@ -1,815 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-import java.io.IOException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import org.onap.policy.apex.model.modelapi.ApexApiResult;
-import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
-import org.onap.policy.common.utils.resources.TextFileUtils;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * The class represents the root resource exposed at the base URL<br> The url to access this resource would be in the
- * form {@code <baseURL>/rest/<session>/....} <br> For example: a PUT request to the following URL
- * {@code http://localhost:8080/apex/rest/109/ContextSchema/Update}, with a JSON string payload containing the new
- * {@code Schema} in the body, can be explained as: <ul> <li>The server or servlet is running at the base URL
- * {@code http://localhost:8080/apex} <li>This resource {@code ApexRestEditorResource} is used because the path
- * {@code rest/109} matches the {@code Path} filter specification for this Resource ({@code @Path("rest/{session}")}),
- * where the {@code int} path parameter {@code session} is assigned the {@code int} value {@code 109} <li>The path
- * {@code ContextSchema/Update} redirects this call to the method {@link #updateContextSchema(String)}, which should be
- * a {@link javax.ws.rs.PUT}, with a single String in the body/payload which gets mapped to the single String parameter
- * for the method. <li>So, in summary, the REST request updates a {@code ContextSchema} as specified in the payload for
- * {@code session} number {@code 109} </ul>
- *
- * <b>Note:</b> An allocated {@code Session} identifier must be included in (almost) all requests. Models for different
- * {@code Session} identifiers are completely isolated from one another.
- *
- * <b>Note:</b> To create a new {@code Session}, and have a new session ID allocated use {@link javax.ws.rs.GET} request
- * to {@code <baseURL>/rest/-1/Session/Create} (for example: {@code http://localhost:8080/apex/rest/-1/Session/Create} )
- *
- */
-@Path("editor/{session}")
-@Produces({MediaType.APPLICATION_JSON})
-@Consumes({MediaType.APPLICATION_JSON})
-
-public class ApexEditorRestResource implements RestCommandHandler {
-    // Get a reference to the logger
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ApexEditorRestResource.class);
-
-    // Location of the periodi event template
-    private static final String PERIODIC_EVENT_TEMPLATE = "src/main/resources/templates/PeriodicEventTemplate.json";
-
-    // Recurring string constants
-    private static final String NAME = "name";
-    private static final String VERSION = "version";
-    private static final String REST_COMMAND_NOT_RECOGNISED = "REST command not recognised";
-    private static final String OK = ": OK";
-    private static final String NOT_OK = ": Not OK";
-    private static final String SESSION_CREATE = "Session/Create";
-    private static final String SESSION_CREATE_NOT_OK = "Session/Create: Not OK";
-
-    // The session handler for sessions on the Apex editor
-    private static final RestSessionHandler SESSION_HANDLER = new RestSessionHandler();
-
-    // Handlers for the various parts of an Apex model
-    //@formatter:off
-    private static final ModelHandler         MODEL_HANDLER          = new ModelHandler();
-    private static final KeyInfoHandler       KEY_INFO_HANDLER       = new KeyInfoHandler();
-    private static final ContextSchemaHandler CONTEXT_SCHEMA_HANDLER = new ContextSchemaHandler();
-    private static final ContextAlbumHandler  CONTEXT_ALBUM_HANDLER  = new ContextAlbumHandler();
-    private static final EventHandler         EVENT_HANDLER          = new EventHandler();
-    private static final TaskHandler          TASK_HANDLER           = new TaskHandler();
-    private static final PolicyHandler        POLICY_HANDLER         = new PolicyHandler();
-    //@formatter:on
-
-    // The ID of this session. This gets injected from the URL.
-    @PathParam("session")
-    private int sessionId = -1;
-
-    /**
-     * Creates a new session. Always call this method with sessionID -1, whereby a new sessionID will be allocated. If
-     * successful the new sessionID will be available in the first message in the result.
-     *
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}. This includes the session id
-     *         for this session.
-     */
-    @GET
-    @Path("Session/Create")
-    public ApexApiResult createSession() {
-        if (sessionId != -1) {
-            return new ApexApiResult(Result.FAILED, "Session ID must be set to -1 to create sessions: " + sessionId);
-        }
-
-        ApexApiResult result = new ApexApiResult();
-        SESSION_HANDLER.createSession(result);
-        return result;
-    }
-
-    /**
-     * Load the model from a JSON string for this session.
-     *
-     * @param jsonString the JSON string to be parsed. The returned value(s) will be similar to {@code AxPolicyModel},
-     *        with merged {@code AxKeyInfo} for the root object.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @PUT
-    @Path("/Model/Load")
-    public ApexApiResult loadFromString(final String jsonString) {
-        return processRestCommand(RestCommandType.MODEL, RestCommand.LOAD, jsonString);
-    }
-
-    /**
-     * Analyse the model and return analysis results. If successful the analysis results will be available in the
-     * messages in the result.
-     *
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("Model/Analyse")
-    public ApexApiResult analyse() {
-        return processRestCommand(RestCommandType.MODEL, RestCommand.ANALYSE);
-    }
-
-    /**
-     * Validate the model and return validation results. If successful the validation results will be available in the
-     * messages in the result.
-     *
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("Model/Validate")
-    public ApexApiResult validate() {
-        return processRestCommand(RestCommandType.MODEL, RestCommand.VALIDATE);
-    }
-
-    /**
-     * Creates the new model model for this session.
-     *
-     * @param jsonString the JSON string to be parsed containing the new model. See {@code BeanModel}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @POST
-    @Path("Model/Create")
-    public ApexApiResult createModel(final String jsonString) {
-        return processRestCommand(RestCommandType.MODEL, RestCommand.CREATE, jsonString);
-    }
-
-    /**
-     * Update the model for this session.
-     *
-     * @param jsonString the JSON string to be parsed containing the updated model. See {@code BeanModel}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @PUT
-    @Path("Model/Update")
-    public ApexApiResult updateModel(final String jsonString) {
-        return processRestCommand(RestCommandType.MODEL, RestCommand.UPDATE, jsonString);
-    }
-
-    /**
-     * Gets the key for the model for this session. If successful the model key will be available in the first message
-     * in the result. See {@code AxKey}
-     *
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("Model/GetKey")
-    public ApexApiResult getModelKey() {
-        return processRestCommand(RestCommandType.MODEL, RestCommand.GET_KEY);
-    }
-
-    /**
-     * Retrieve the model for this session. If successful the model will be available in the first message in the
-     * result. The returned value will be similar to a {@code AxPolicyModel}, with merged {@code AxKeyInfo} for the root
-     * object.
-     *
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("Model/Get")
-    public ApexApiResult listModel() {
-        return processRestCommand(RestCommandType.MODEL, RestCommand.LIST);
-    }
-
-    /**
-     * Download the model for this session as a String.
-     *
-     * @return the model represented as a JSON string. See {@code AxPolicyModel}
-     */
-    @GET
-    @Path("Model/Download")
-    public String downloadModel() {
-        ApexApiResult result = processRestCommand(RestCommandType.MODEL, RestCommand.DOWNLOAD);
-        if (result != null && result.isOk()) {
-            return result.getMessage();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Delete the model for this session.
-     *
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @DELETE
-    @Path("Model/Delete")
-    public ApexApiResult deleteModel() {
-        return processRestCommand(RestCommandType.MODEL, RestCommand.DELETE);
-    }
-
-    /**
-     * List key information with the given key names/versions. If successful the result(s) will be available in the
-     * result messages. See {@code AxKeyInfo}
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("KeyInformation/Get")
-    public ApexApiResult listKeyInformation(@QueryParam(NAME) final String name,
-            @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.KEY_INFO, RestCommand.LIST, name, version);
-    }
-
-    /**
-     * Creates a context schema with the information in the JSON string passed.
-     *
-     * @param jsonString the JSON string to be parsed. See {@code BeanContextSchema}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @POST
-    @Path("ContextSchema/Create")
-    public ApexApiResult createContextSchema(final String jsonString) {
-        return processRestCommand(RestCommandType.CONTEXT_SCHEMA, RestCommand.CREATE, jsonString);
-    }
-
-    /**
-     * Update a context schema with the information in the JSON string passed.
-     *
-     * @param jsonString the JSON string to be parsed. See {@code BeanContextSchema}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @PUT
-    @Path("ContextSchema/Update")
-    public ApexApiResult updateContextSchema(final String jsonString) {
-        return processRestCommand(RestCommandType.CONTEXT_SCHEMA, RestCommand.UPDATE, jsonString);
-    }
-
-    /**
-     * List context schemas with the given key names/versions. If successful the result(s) will be available in the
-     * result messages. The returned value(s) will be similar to {@code AxContextSchema}, with merged {@code AxKeyInfo}
-     * for the root object.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("ContextSchema/Get")
-    public ApexApiResult listContextSchemas(@QueryParam(NAME) final String name,
-            @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.CONTEXT_SCHEMA, RestCommand.LIST, name, version);
-    }
-
-    /**
-     * Delete context schemas with the given key names/versions.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @DELETE
-    @Path("ContextSchema/Delete")
-    public ApexApiResult deleteContextSchema(@QueryParam(NAME) final String name,
-            @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.CONTEXT_SCHEMA, RestCommand.DELETE, name, version);
-    }
-
-    /**
-     * Validate context schemas with the given key names/versions. The result(s) will be available in the result
-     * messages.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("Validate/ContextSchema")
-    public ApexApiResult validateContextSchemas(@QueryParam(NAME) final String name,
-            @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.CONTEXT_SCHEMA, RestCommand.VALIDATE, name, version);
-    }
-
-    /**
-     * Creates a context album with the information in the JSON string passed.
-     *
-     * @param jsonString the JSON string to be parsed. See {@code BeanContextAlbum}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @POST
-    @Path("ContextAlbum/Create")
-    public ApexApiResult createContextAlbum(final String jsonString) {
-        return processRestCommand(RestCommandType.CONTEXT_ALBUM, RestCommand.CREATE, jsonString);
-    }
-
-    /**
-     * Update a context album with the information in the JSON string passed.
-     *
-     * @param jsonString the JSON string to be parsed. See {@code BeanContextAlbum}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @PUT
-    @Path("ContextAlbum/Update")
-    public ApexApiResult updateContextAlbum(final String jsonString) {
-        return processRestCommand(RestCommandType.CONTEXT_ALBUM, RestCommand.UPDATE, jsonString);
-    }
-
-    /**
-     * List context albums with the given key names/versions. If successful the result(s) will be available in the
-     * result messages. The returned value(s) will be similar to {@code AxContextAlbum}, with merged {@code AxKeyInfo}
-     * for the root object.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("ContextAlbum/Get")
-    public ApexApiResult listContextAlbums(@QueryParam(NAME) final String name,
-            @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.CONTEXT_ALBUM, RestCommand.LIST, name, version);
-    }
-
-    /**
-     * Delete context albums with the given key names/versions.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @DELETE
-    @Path("ContextAlbum/Delete")
-    public ApexApiResult deleteContextAlbum(@QueryParam(NAME) final String name,
-            @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.CONTEXT_ALBUM, RestCommand.DELETE, name, version);
-    }
-
-    /**
-     * Validate context albums with the given key names/versions. The result(s) will be available in the result
-     * messages.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("Validate/ContextAlbum")
-    public ApexApiResult validateContextAlbums(@QueryParam(NAME) final String name,
-            @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.CONTEXT_ALBUM, RestCommand.VALIDATE, name, version);
-    }
-
-    /**
-     * Creates an event with the information in the JSON string passed.
-     *
-     * @param jsonString the JSON string to be parsed. See {@code BeanEvent}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @POST
-    @Path("Event/Create")
-    public ApexApiResult createEvent(final String jsonString) {
-        return processRestCommand(RestCommandType.EVENT, RestCommand.CREATE, jsonString);
-    }
-
-    /**
-     * Update an event with the information in the JSON string passed.
-     *
-     * @param jsonString the JSON string to be parsed. See {@code BeanEvent}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @PUT
-    @Path("Event/Update")
-    public ApexApiResult updateEvent(final String jsonString) {
-        return processRestCommand(RestCommandType.EVENT, RestCommand.UPDATE, jsonString);
-    }
-
-    /**
-     * List events with the given key names/versions. If successful the result(s) will be available in the result
-     * messages. The returned value(s) will be similar to {@code AxEvent}, with merged {@code AxKeyInfo} for the root
-     * object.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("Event/Get")
-    public ApexApiResult listEvent(@QueryParam(NAME) final String name, @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.EVENT, RestCommand.LIST, name, version);
-    }
-
-    /**
-     * Delete events with the given key names/versions.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @DELETE
-    @Path("Event/Delete")
-    public ApexApiResult deleteEvent(@QueryParam(NAME) final String name, @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.EVENT, RestCommand.DELETE, name, version);
-    }
-
-    /**
-     * Validate events with the given key names/versions. The result(s) will be available in the result messages.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("Validate/Event")
-    public ApexApiResult validateEvent(@QueryParam(NAME) final String name, @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.EVENT, RestCommand.VALIDATE, name, version);
-    }
-
-    /**
-     * Creates a task with the information in the JSON string passed.
-     *
-     * @param jsonString the JSON string to be parsed. See {@code BeanTask}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @POST
-    @Path("Task/Create")
-    public ApexApiResult createTask(final String jsonString) {
-        return processRestCommand(RestCommandType.TASK, RestCommand.CREATE, jsonString);
-    }
-
-    /**
-     * Update a task with the information in the JSON string passed.
-     *
-     * @param jsonString the JSON string to be parsed. See {@code BeanTask}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @PUT
-    @Path("Task/Update")
-    public ApexApiResult updateTask(final String jsonString) {
-        return processRestCommand(RestCommandType.TASK, RestCommand.UPDATE, jsonString);
-    }
-
-    /**
-     * List tasks with the given key names/versions. If successful the result(s) will be available in the result
-     * messages. The returned value(s) will be similar to {@code AxTask}, with merged {@code AxKeyInfo} for the root
-     * object.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("Task/Get")
-    public ApexApiResult listTask(@QueryParam(NAME) final String name, @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.TASK, RestCommand.LIST, name, version);
-    }
-
-    /**
-     * Delete tasks with the given key names/versions.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @DELETE
-    @Path("Task/Delete")
-    public ApexApiResult deleteTask(@QueryParam(NAME) final String name, @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.TASK, RestCommand.DELETE, name, version);
-    }
-
-    /**
-     * Validate tasks with the given key names/versions. The result(s) will be available in the result messages.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("Validate/Task")
-    public ApexApiResult validateTask(@QueryParam(NAME) final String name, @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.TASK, RestCommand.VALIDATE, name, version);
-    }
-
-    // CHECKSTYLE:OFF: MethodLength
-    /**
-     * Creates a policy with the information in the JSON string passed.
-     *
-     * @param jsonString the JSON string to be parsed See {@code BeanPolicy}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @POST
-    @Path("Policy/Create")
-    public ApexApiResult createPolicy(final String jsonString) {
-        return processRestCommand(RestCommandType.POLICY, RestCommand.CREATE, jsonString);
-    }
-
-    /**
-     * Update a policy with the information in the JSON string passed.
-     *
-     * @param firstStatePeriodic indicates if periodic event should be created and added to model
-     * @param jsonString the JSON string to be parsed. See {@code BeanPolicy}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @PUT
-    @Path("Policy/Update")
-    public ApexApiResult updatePolicy(@QueryParam("firstStatePeriodic") final boolean firstStatePeriodic,
-            final String jsonString) {
-
-        ApexApiResult result = processRestCommand(RestCommandType.POLICY, RestCommand.UPDATE, jsonString);
-        if (result != null && result.isOk() && firstStatePeriodic) {
-            result = createPeriodicEvent();
-        }
-        return result;
-    }
-
-    /**
-     * List policies with the given key names/versions. If successful the result(s) will be available in the result
-     * messages. The returned value(s) will be similar to {@code AxPolicy}, with merged {@code AxKeyInfo} for the root
-     * object.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @GET
-    @Path("Policy/Get")
-    public ApexApiResult listPolicy(@QueryParam(NAME) final String name, @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.POLICY, RestCommand.LIST, name, version);
-    }
-
-    /**
-     * Delete policies with the given key names/versions.
-     *
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    @DELETE
-    @Path("Policy/Delete")
-    public ApexApiResult deletePolicy(@QueryParam(NAME) final String name, @QueryParam(VERSION) final String version) {
-        return processRestCommand(RestCommandType.POLICY, RestCommand.DELETE, name, version);
-    }
-
-    /**
-     * This method routes REST commands that take no parameters to their caller.
-     *
-     * @param commandType the type of REST command to process
-     * @param command the REST command to process
-     * @return the result of the REST command
-     */
-    private ApexApiResult processRestCommand(final RestCommandType commandType, final RestCommand command) {
-        LOGGER.entry(commandType);
-        try {
-            ApexApiResult result = new ApexApiResult();
-            RestSession session = SESSION_HANDLER.getSession(sessionId, result);
-            if (session == null) {
-                return result;
-            }
-            result = executeRestCommand(session, commandType, command);
-            LOGGER.exit(SESSION_CREATE + (result != null && result.isOk() ? OK : NOT_OK));
-            return result;
-        } catch (final Exception e) {
-            LOGGER.catching(e);
-            LOGGER.exit(SESSION_CREATE_NOT_OK);
-            throw e;
-        }
-    }
-
-    /**
-     * This method routes REST commands that take a JSON string to their caller.
-     *
-     * @param commandType the type of REST command to process
-     * @param command the REST command to process
-     * @param jsonString the JSON string received in the REST request
-     * @return the result of the REST command
-     */
-    private ApexApiResult processRestCommand(final RestCommandType commandType, final RestCommand command,
-            final String jsonString) {
-        LOGGER.entry(commandType, jsonString);
-        try {
-            ApexApiResult result = new ApexApiResult();
-            RestSession session = SESSION_HANDLER.getSession(sessionId, result);
-            if (session == null) {
-                return result;
-            }
-            result = executeRestCommand(session, commandType, command, jsonString);
-            LOGGER.exit(SESSION_CREATE + (result != null && result.isOk() ? OK : NOT_OK));
-            return result;
-        } catch (final Exception e) {
-            LOGGER.catching(e);
-            LOGGER.exit(SESSION_CREATE_NOT_OK);
-            throw e;
-        }
-    }
-
-    /**
-     * This method routes REST commands that take a name and version to their caller.
-     *
-     * @param commandType the type of REST command to process
-     * @param command the REST command to process
-     * @param name the name received in the REST request
-     * @param version the name received in the REST request
-     * @return the result of the REST command
-     */
-    private ApexApiResult processRestCommand(final RestCommandType commandType, final RestCommand command,
-            final String name, final String version) {
-        LOGGER.entry(commandType, name, version);
-        try {
-            ApexApiResult result = new ApexApiResult();
-            RestSession session = SESSION_HANDLER.getSession(sessionId, result);
-            if (session == null) {
-                return result;
-            }
-            result = executeRestCommand(session, commandType, command, name, version);
-            LOGGER.exit(SESSION_CREATE + (result != null && result.isOk() ? OK : NOT_OK));
-            return result;
-        } catch (final Exception e) {
-            LOGGER.catching(e);
-            LOGGER.exit(SESSION_CREATE_NOT_OK);
-            throw e;
-        }
-    }
-
-    /**
-     * This method invokes callers to run REST commands that take no parameters.
-     *
-     * @param session the Apex editor session
-     * @param commandType the type of REST command to process
-     * @param command the REST command to process
-     * @return the result of the REST command
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-            final RestCommand command) {
-        switch (commandType) {
-            case MODEL:
-                return MODEL_HANDLER.executeRestCommand(session, commandType, command);
-            case KEY_INFO:
-                return KEY_INFO_HANDLER.executeRestCommand(session, commandType, command);
-            case CONTEXT_SCHEMA:
-                return CONTEXT_SCHEMA_HANDLER.executeRestCommand(session, commandType, command);
-            case CONTEXT_ALBUM:
-                return CONTEXT_ALBUM_HANDLER.executeRestCommand(session, commandType, command);
-            case EVENT:
-                return EVENT_HANDLER.executeRestCommand(session, commandType, command);
-            case TASK:
-                return TASK_HANDLER.executeRestCommand(session, commandType, command);
-            case POLICY:
-                return POLICY_HANDLER.executeRestCommand(session, commandType, command);
-            default:
-                return new ApexApiResult(Result.FAILED, REST_COMMAND_NOT_RECOGNISED);
-        }
-    }
-
-    /**
-     * This method invokes callers to run REST commands that take a JSON string.
-     *
-     * @param session the Apex editor session
-     * @param commandType the type of REST command to process
-     * @param command the REST command to process
-     * @param jsonString the JSON string received in the REST request
-     * @return the result of the REST command
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-            final RestCommand command, final String jsonString) {
-        switch (commandType) {
-            case MODEL:
-                return MODEL_HANDLER.executeRestCommand(session, commandType, command, jsonString);
-            case KEY_INFO:
-                return KEY_INFO_HANDLER.executeRestCommand(session, commandType, command, jsonString);
-            case CONTEXT_SCHEMA:
-                return CONTEXT_SCHEMA_HANDLER.executeRestCommand(session, commandType, command, jsonString);
-            case CONTEXT_ALBUM:
-                return CONTEXT_ALBUM_HANDLER.executeRestCommand(session, commandType, command, jsonString);
-            case EVENT:
-                return EVENT_HANDLER.executeRestCommand(session, commandType, command, jsonString);
-            case TASK:
-                return TASK_HANDLER.executeRestCommand(session, commandType, command, jsonString);
-            case POLICY:
-                return POLICY_HANDLER.executeRestCommand(session, commandType, command, jsonString);
-            default:
-                return new ApexApiResult(Result.FAILED, REST_COMMAND_NOT_RECOGNISED);
-        }
-    }
-
-    /**
-     * This method invokes callers to run REST commands that take a name and version.
-     *
-     * @param session the Apex editor session
-     * @param commandType the type of REST command to process
-     * @param command the REST command to process
-     * @param name the name received in the REST request
-     * @param version the name received in the REST request
-     * @return the result of the REST command
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-            final RestCommand command, final String name, final String version) {
-        switch (commandType) {
-            case MODEL:
-                return MODEL_HANDLER.executeRestCommand(session, commandType, command, name, version);
-            case KEY_INFO:
-                return KEY_INFO_HANDLER.executeRestCommand(session, commandType, command, name, version);
-            case CONTEXT_SCHEMA:
-                return CONTEXT_SCHEMA_HANDLER.executeRestCommand(session, commandType, command, name, version);
-            case CONTEXT_ALBUM:
-                return CONTEXT_ALBUM_HANDLER.executeRestCommand(session, commandType, command, name, version);
-            case EVENT:
-                return EVENT_HANDLER.executeRestCommand(session, commandType, command, name, version);
-            case TASK:
-                return TASK_HANDLER.executeRestCommand(session, commandType, command, name, version);
-            case POLICY:
-                return POLICY_HANDLER.executeRestCommand(session, commandType, command, name, version);
-            default:
-                return new ApexApiResult(Result.FAILED, REST_COMMAND_NOT_RECOGNISED);
-        }
-    }
-
-    /**
-     * Create a periodic event from the periodic event template.
-     */
-    private ApexApiResult createPeriodicEvent() {
-        String periodicEventJsonString;
-        try {
-            periodicEventJsonString = TextFileUtils.getTextFileAsString(PERIODIC_EVENT_TEMPLATE);
-        } catch (IOException ioException) {
-            String message = "read of periodic event tempalte from " + PERIODIC_EVENT_TEMPLATE + "failed: "
-                    + ioException.getMessage();
-            LOGGER.debug(message, ioException);
-            return new ApexApiResult(Result.FAILED, message);
-        }
-
-        return processRestCommand(RestCommandType.EVENT, RestCommand.CREATE, periodicEventJsonString);
-    }
-
-    /*
-     * This method is used only for testing and is used to cause an exception on calls from unit test to test exception
-     * handling.
-     */
-    protected static int createCorruptSession() {
-        final ApexEditorRestResource apexEditorRestResource = new ApexEditorRestResource();
-        final ApexApiResult result = apexEditorRestResource.createSession();
-        final int corruptSessionId = Integer.parseInt(result.getMessages().get(0));
-
-        SESSION_HANDLER.setCorruptSession(corruptSessionId);
-
-        return corruptSessionId;
-    }
-
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ContextAlbumHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ContextAlbumHandler.java
deleted file mode 100644
index 40c147e7a..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ContextAlbumHandler.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanContextAlbum;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
-import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbum;
-import org.onap.policy.apex.model.modelapi.ApexApiResult;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * This class handles commands on context albums in Apex models.
- */
-public class ContextAlbumHandler implements RestCommandHandler {
-    // Get a reference to the logger
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ContextAlbumHandler.class);
-
-    // Recurring string constants
-    private static final String OK = ": OK";
-    private static final String NOT_OK = ": Not OK";
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command) {
-        return getUnsupportedCommandResultMessage(session, commandType, command);
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String jsonString) {
-        if (!RestCommandType.CONTEXT_ALBUM.equals(commandType)) {
-            return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-
-        switch (command) {
-            case CREATE:
-                return createContextAlbum(session, jsonString);
-            case UPDATE:
-                return updateContextAlbum(session, jsonString);
-            default:
-                return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String name, final String version) {
-        if (!RestCommandType.CONTEXT_ALBUM.equals(commandType)) {
-            return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-
-        switch (command) {
-            case LIST:
-                return listContextAlbums(session, name, version);
-            case DELETE:
-                return deleteContextAlbum(session, name, version);
-            case VALIDATE:
-                return validateContextAlbum(session, name, version);
-            default:
-                return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-    }
-
-    /**
-     * Creates a context album with the information in the JSON string passed.
-     *
-     * @param session the Apex model editing session
-     * @param jsonString the JSON string to be parsed. See {@linkplain BeanContextAlbum}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult createContextAlbum(final RestSession session, final String jsonString) {
-        LOGGER.entry(jsonString);
-
-        session.editModel();
-
-        final BeanContextAlbum jsonbean = RestUtils.getJsonParameters(jsonString, BeanContextAlbum.class);
-
-        ApexApiResult result = session.getApexModelEdited().createContextAlbum(jsonbean.getName(),
-                        jsonbean.getVersion(), jsonbean.getScope(), Boolean.toString(jsonbean.getWriteable()),
-                        jsonbean.getItemSchema().getName(), jsonbean.getItemSchema().getVersion(), jsonbean.getUuid(),
-                        jsonbean.getDescription());
-
-        if (result != null) {
-            session.finishSession(result.isOk());
-            LOGGER.exit("ContextAlbum/Create" + (result.isOk() ? OK : NOT_OK));
-        }
-
-        return result;
-    }
-
-    /**
-     * Update a context album with the information in the JSON string passed.
-     *
-     * @param session the Apex model editing session
-     * @param jsonString the JSON string to be parsed. See {@linkplain BeanContextAlbum}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult updateContextAlbum(final RestSession session, final String jsonString) {
-        LOGGER.entry(jsonString);
-
-        session.editModel();
-
-        final BeanContextAlbum jsonbean = RestUtils.getJsonParameters(jsonString, BeanContextAlbum.class);
-
-        ApexApiResult result = session.getApexModelEdited().updateContextAlbum(jsonbean.getName(),
-                        jsonbean.getVersion(), jsonbean.getScope(), Boolean.toString(jsonbean.getWriteable()),
-                        jsonbean.getItemSchema().getName(), jsonbean.getItemSchema().getVersion(), jsonbean.getUuid(),
-                        jsonbean.getDescription());
-
-        if (result != null) {
-            session.finishSession(result.isOk());
-            LOGGER.exit("ContextAlbum/Update" + (result.isOk() ? OK : NOT_OK));
-        }
-
-        return result;
-    }
-
-    /**
-     * List context albums with the given key names/versions. If successful the result(s) will be available in the
-     * result messages. The returned value(s) will be similar to {@link AxContextAlbum}, with merged
-     * {@linkplain AxKeyInfo} for the root object.
-     *
-     * @param session the Apex model editing session
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult listContextAlbums(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        ApexApiResult result = session.getApexModel().listContextAlbum(blank2Null(name), blank2Null(version));
-
-        LOGGER.exit("ContextAlbum/Get" + (result != null && result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * Delete context albums with the given key names/versions.
-     *
-     * @param session the Apex model editing session
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult deleteContextAlbum(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        session.editModel();
-
-        ApexApiResult result = session.getApexModelEdited().deleteContextAlbum(blank2Null(name), blank2Null(version));
-
-        if (result != null) {
-            session.finishSession(result.isOk());
-            LOGGER.exit("ContextAlbum/Delete" + (result.isOk() ? OK : NOT_OK));
-        }
-
-        return result;
-    }
-
-    /**
-     * Validate context albums with the given key names/versions. The result(s) will be available in the result
-     * messages.
-     *
-     * @param session the Apex model editing session
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult validateContextAlbum(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        ApexApiResult result = session.getApexModel().validateContextAlbum(blank2Null(name), blank2Null(version));
-
-        LOGGER.exit("Validate/ContextAlbum" + (result != null && result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ContextSchemaHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ContextSchemaHandler.java
deleted file mode 100644
index 3805e1e1c..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ContextSchemaHandler.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanContextSchema;
-import org.onap.policy.apex.model.modelapi.ApexApiResult;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * This class handles commands on context schemas in Apex models.
- */
-public class ContextSchemaHandler implements RestCommandHandler {
-    // Get a reference to the logger
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ContextSchemaHandler.class);
-
-    // Recurring string constants
-    private static final String OK = ": OK";
-    private static final String NOT_OK = ": Not OK";
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command) {
-        return getUnsupportedCommandResultMessage(session, commandType, command);
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String jsonString) {
-        if (!RestCommandType.CONTEXT_SCHEMA.equals(commandType)) {
-            return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-
-        switch (command) {
-            case CREATE:
-                return createContextSchema(session, jsonString);
-            case UPDATE:
-                return updateContextSchema(session, jsonString);
-            default:
-                return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String name, final String version) {
-        if (!RestCommandType.CONTEXT_SCHEMA.equals(commandType)) {
-            return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-
-        switch (command) {
-            case LIST:
-                return listContextSchemas(session, name, version);
-            case DELETE:
-                return deleteContextSchema(session, name, version);
-            case VALIDATE:
-                return validateContextSchemas(session, name, version);
-            default:
-                return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-    }
-
-    /**
-     * Creates a context schema.
-     *
-     * @param session the session holding the Apex model
-     * @param jsonString the JSON string with the context schema parameters
-     * @return the result of the operation
-     */
-    private ApexApiResult createContextSchema(final RestSession session, final String jsonString) {
-        LOGGER.entry(jsonString);
-
-        session.editModel();
-
-        final BeanContextSchema jsonbean = RestUtils.getJsonParameters(jsonString, BeanContextSchema.class);
-        ApexApiResult result = session.getApexModelEdited().createContextSchema(jsonbean.getName(),
-                        jsonbean.getVersion(), jsonbean.getSchemaFlavour(), jsonbean.getSchemaDefinition(),
-                        jsonbean.getUuid(), jsonbean.getDescription());
-
-        if (result != null) {
-            session.finishSession(result.isOk());
-            LOGGER.exit("ContextSchema/create" + (result.isOk() ? OK : NOT_OK));
-        }
-
-        return result;
-    }
-
-    /**
-     * Update a context schema.
-     *
-     * @param session the session holding the Apex model
-     * @param jsonString the JSON string with the context schema parameters
-     * @return the result of the operation
-     */
-    private ApexApiResult updateContextSchema(final RestSession session, final String jsonString) {
-        LOGGER.entry(jsonString);
-
-        session.editModel();
-
-        final BeanContextSchema jsonbean = RestUtils.getJsonParameters(jsonString, BeanContextSchema.class);
-
-        ApexApiResult result = session.getApexModelEdited().updateContextSchema(jsonbean.getName(),
-                        jsonbean.getVersion(), jsonbean.getSchemaFlavour(), jsonbean.getSchemaDefinition(),
-                        jsonbean.getUuid(), jsonbean.getDescription());
-
-        if (result != null) {
-            session.finishSession(result.isOk());
-            LOGGER.exit("ContextSchema/Update" + (result.isOk() ? OK : NOT_OK));
-        }
-
-        return result;
-    }
-
-    /**
-     * List context schemas.
-     *
-     * @param session the session holding the Apex model
-     * @param name the context schema name to operate on
-     * @param version the context schema version to operate on
-     * @return the result of the operation
-     */
-    private ApexApiResult listContextSchemas(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        ApexApiResult result = session.getApexModel().listContextSchemas(blank2Null(name), blank2Null(version));
-
-        LOGGER.exit("ContextSchema/Get" + (result != null && result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * Delete a context schema.
-     *
-     * @param session the session holding the Apex model
-     * @param name the context schema name to operate on
-     * @param version the context schema version to operate on
-     * @return the result of the operation
-     */
-    private ApexApiResult deleteContextSchema(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        session.editModel();
-
-        ApexApiResult result = session.getApexModelEdited().deleteContextSchema(blank2Null(name), blank2Null(version));
-
-        if (result != null) {
-            session.finishSession(result.isOk());
-            LOGGER.exit("ContextSchema/Delete" + (result.isOk() ? OK : NOT_OK));
-        }
-
-        return result;
-    }
-
-    /**
-     * Validate a context schema.
-     *
-     * @param session the session holding the Apex model
-     * @param name the context schema name to operate on
-     * @param version the context schema version to operate on
-     * @return the result of the operation
-     */
-    private ApexApiResult validateContextSchemas(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        ApexApiResult result = session.getApexModel().validateContextSchemas(blank2Null(name), blank2Null(version));
-
-        LOGGER.exit("Validate/ContextSchema" + (result != null && result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/EventHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/EventHandler.java
deleted file mode 100644
index 60ebdd58d..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/EventHandler.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-import java.util.Map.Entry;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanEvent;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanField;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
-import org.onap.policy.apex.model.eventmodel.concepts.AxEvent;
-import org.onap.policy.apex.model.modelapi.ApexApiResult;
-import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * This class handles commands on events in Apex models.
- */
-public class EventHandler implements RestCommandHandler {
-    // Get a reference to the logger
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(EventHandler.class);
-
-    // Recurring string constants
-    private static final String OK = ": OK";
-    private static final String NOT_OK = ": Not OK";
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command) {
-        return getUnsupportedCommandResultMessage(session, commandType, command);
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String jsonString) {
-        if (!RestCommandType.EVENT.equals(commandType)) {
-            return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-
-        switch (command) {
-            case CREATE:
-                return createEvent(session, jsonString);
-            case UPDATE:
-                return updateEvent(session, jsonString);
-            default:
-                return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String name, final String version) {
-        if (!RestCommandType.EVENT.equals(commandType)) {
-            return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-
-        switch (command) {
-            case LIST:
-                return listEvents(session, name, version);
-            case DELETE:
-                return deleteEvent(session, name, version);
-            case VALIDATE:
-                return validateEvent(session, name, version);
-            default:
-                return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-    }
-
-    /**
-     * Creates an event with the information in the JSON string passed.
-     *
-     * @param session the Apex model editing session
-     * @param jsonString the JSON string to be parsed. See {@linkplain BeanEvent}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult createEvent(final RestSession session, final String jsonString) {
-        LOGGER.entry(jsonString);
-
-        final BeanEvent jsonbean = RestUtils.getJsonParameters(jsonString, BeanEvent.class);
-
-        session.editModel();
-
-        ApexApiResult result = session.getApexModelEdited().createEvent(jsonbean.getName(), jsonbean.getVersion(),
-                        jsonbean.getNameSpace(), jsonbean.getSource(), jsonbean.getTarget(), jsonbean.getUuid(),
-                        jsonbean.getDescription());
-
-        if (result.isOk()) {
-            result = createEventParameters(session, jsonbean);
-        }
-
-        session.finishSession(result.isOk());
-
-        LOGGER.exit("Event/Create" + (result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * Create the parameters on an event.
-     *
-     * @param session the Apex editor session
-     * @param jsonbean the JSON bean holding the parameters
-     * @return result the result of the parameter creation operation
-     */
-    private ApexApiResult createEventParameters(final RestSession session, final BeanEvent jsonbean) {
-        ApexApiResult result = new ApexApiResult();
-
-        if (jsonbean.getParameters() == null || jsonbean.getParameters().isEmpty()) {
-            return result;
-        }
-
-        for (final Entry<String, BeanField> parameterEntry : jsonbean.getParameters().entrySet()) {
-            if (parameterEntry.getValue() == null) {
-                result.setResult(Result.FAILED);
-                result.addMessage("Null event parameter information for parameter \"" + parameterEntry.getKey()
-                                + "\" in event " + jsonbean.getName() + ":" + jsonbean.getVersion()
-                                + ". The event was created, but there was an error adding the event parameters."
-                                + " The event has only been partially defined.");
-                continue;
-            }
-
-            final ApexApiResult createParResult = session.getApexModelEdited().createEventPar(jsonbean.getName(),
-                            jsonbean.getVersion(), parameterEntry.getKey(), parameterEntry.getValue().getName(),
-                            parameterEntry.getValue().getVersion(), parameterEntry.getValue().getOptional());
-            if (createParResult.isNok()) {
-                result.setResult(createParResult.getResult());
-                result.addMessage("Failed to add event parameter information for parameter \"" + parameterEntry.getKey()
-                                + "\" in event " + jsonbean.getName() + ":" + jsonbean.getVersion()
-                                + ". The event was created, but there was an error adding the event parameters."
-                                + " The event has only been partially defined.");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Update an event with the information in the JSON string passed.
-     *
-     * @param session the Apex model editing session
-     * @param jsonString the JSON string to be parsed. See {@linkplain BeanEvent}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult updateEvent(final RestSession session, final String jsonString) {
-        LOGGER.entry(jsonString);
-
-        final BeanEvent jsonbean = RestUtils.getJsonParameters(jsonString, BeanEvent.class);
-
-        if (blank2Null(jsonbean.getName()) == null || blank2Null(jsonbean.getVersion()) == null) {
-            LOGGER.exit("Event/Update" + NOT_OK);
-            return new ApexApiResult(Result.FAILED, "Null/Empty event name/version (\"" + jsonbean.getName() + ":"
-                            + jsonbean.getVersion() + "\" passed to UpdateEvent");
-        }
-
-        session.editModel();
-
-        ApexApiResult result = session.getApexModelEdited().deleteEvent(blank2Null(jsonbean.getName()),
-                        blank2Null(jsonbean.getVersion()));
-
-        if (result.isOk()) {
-            result = session.getApexModelEdited().createEvent(jsonbean.getName(), jsonbean.getVersion(),
-                            jsonbean.getNameSpace(), jsonbean.getSource(), jsonbean.getTarget(), jsonbean.getUuid(),
-                            jsonbean.getDescription());
-
-            if (result.isOk() && jsonbean.getParameters() != null) {
-                result = createEventParameters(session, jsonbean);
-            }
-        }
-
-        session.finishSession(result.isOk());
-
-        LOGGER.exit("Event/Update" + (result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * List events with the given key names/versions. If successful the result(s) will be available in the result
-     * messages. The returned value(s) will be similar to {@link AxEvent}, with merged {@linkplain AxKeyInfo} for the
-     * root object.
-     *
-     * @param session the Apex model editing session
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult listEvents(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        ApexApiResult result = session.getApexModel().listEvent(blank2Null(name), blank2Null(version));
-
-        LOGGER.exit("Event/Get" + (result != null && result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * Delete events with the given key names/versions.
-     *
-     * @param session the Apex model editing session
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult deleteEvent(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        session.editModel();
-
-        ApexApiResult result = session.getApexModelEdited().deleteEvent(blank2Null(name), blank2Null(version));
-
-        if (result != null) {
-            session.finishSession(result.isOk());
-            LOGGER.exit("Event/Delete" + (result.isOk() ? OK : NOT_OK));
-        }
-
-        return result;
-    }
-
-    /**
-     * Validate events with the given key names/versions. The result(s) will be available in the result messages.
-     *
-     * @param session the Apex model editing session
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult validateEvent(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        ApexApiResult result = session.getApexModel().validateEvent(blank2Null(name), blank2Null(version));
-
-        LOGGER.exit("Validate/Event" + (result != null && result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/KeyInfoHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/KeyInfoHandler.java
deleted file mode 100644
index ddf1db35d..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/KeyInfoHandler.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-import org.onap.policy.apex.model.modelapi.ApexApiResult;
-
-/**
- * This class handles commands on key information in Apex models.
- */
-public class KeyInfoHandler implements RestCommandHandler {
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command) {
-        return getUnsupportedCommandResultMessage(session, commandType, command);
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String jsonString) {
-        return getUnsupportedCommandResultMessage(session, commandType, command);
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String name, final String version) {
-
-        if (RestCommandType.KEY_INFO.equals(commandType) && RestCommand.LIST.equals(command)) {
-            return listKeyInformation(session, name, version);
-        } else {
-            return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-    }
-
-    /**
-     * Get the key information for a concept with the given name and version.
-     * @param session the editor session containing the Apex model
-     * @param name the name for the search
-     * @param version the version for the search
-     * @return the key information
-     */
-    private ApexApiResult listKeyInformation(final RestSession session, final String name, final String version) {
-        return session.getApexModel().listKeyInformation(blank2Null(name), blank2Null(version));
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ModelHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ModelHandler.java
deleted file mode 100644
index 49163ab84..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/ModelHandler.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import java.util.ArrayList;
-import java.util.List;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanModel;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
-import org.onap.policy.apex.model.modelapi.ApexApiResult;
-import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
-import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * This class handles commands on Apex models.
- */
-public class ModelHandler implements RestCommandHandler {
-
-    // Get a reference to the logger
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ModelHandler.class);
-
-    // Recurring string constants
-    private static final String OK = ": OK";
-    private static final String NOT_OK = ": Not OK";
-    private static final String KEY = "key";
-    private static final String NAME = "name";
-    private static final String VERSION = "version";
-    private static final String UUID = "uuid";
-    private static final String DESCRIPTION = "description";
-    private static final String POLICY_KEY = "policyKey";
-    private static final String APEX_KEY_INFO = "apexKeyInfo";
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command) {
-        if (!RestCommandType.MODEL.equals(commandType)) {
-            return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-
-        switch (command) {
-            case ANALYSE:
-                return analyse(session);
-            case VALIDATE:
-                return validate(session);
-            case GET_KEY:
-                return getModelKey(session);
-            case LIST:
-                return listModel(session);
-            case DOWNLOAD:
-                return downloadModel(session);
-            case DELETE:
-                return deleteModel(session);
-            default:
-                return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String jsonString) {
-        if (!RestCommandType.MODEL.equals(commandType)) {
-            return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-
-        switch (command) {
-            case LOAD:
-                return loadFromString(session, jsonString);
-            case CREATE:
-                return createModel(session, jsonString);
-            case UPDATE:
-                return updateModel(session, jsonString);
-            default:
-                return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String name, final String version) {
-        return getUnsupportedCommandResultMessage(session, commandType, command);
-    }
-
-    /**
-     * Load the model from a JSON string for this session.
-     *
-     * @param session the Apex model editing session
-     * @param jsonString the JSON string to be parsed. The returned value(s) will be similar to {@link AxPolicyModel},
-     *        with merged {@linkplain AxKeyInfo} for the root object.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult loadFromString(final RestSession session, final String jsonString) {
-        LOGGER.entry(jsonString);
-
-        session.editModel();
-
-        ApexApiResult result = session.getApexModelEdited().loadFromString(jsonString);
-
-        if (result != null) {
-            session.finishSession(result.isOk());
-            LOGGER.exit("Model/Load" + (result.isOk() ? OK : NOT_OK));
-        }
-
-        return result;
-    }
-
-    /**
-     * Analyse the model and return analysis results. If successful the analysis results will be available in the
-     * messages in the result.
-     *
-     * @param session the Apex model editing session
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult analyse(final RestSession session) {
-        LOGGER.entry();
-
-        ApexApiResult result = session.getApexModel().analyse();
-
-        LOGGER.exit("Model/Analyse" + (result != null && result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * Validate the model and return validation results. If successful the validation results will be available in the
-     * messages in the result.
-     *
-     * @param session the Apex model editing session
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult validate(final RestSession session) {
-        LOGGER.entry();
-
-        ApexApiResult result = session.getApexModel().validate();
-
-        LOGGER.exit("Model/Validate" + (result != null && result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * Creates the new model model for this session.
-     *
-     * @param session the Apex model editing session
-     * @param jsonString the JSON string to be parsed containing the new model. See {@linkplain BeanModel}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult createModel(final RestSession session, final String jsonString) {
-        LOGGER.entry(jsonString);
-
-        final BeanModel jsonbean = RestUtils.getJsonParameters(jsonString, BeanModel.class);
-
-        session.editModel();
-
-        ApexApiResult result = session.getApexModelEdited().createModel(jsonbean.getName(), jsonbean.getVersion(),
-                        jsonbean.getUuid(), jsonbean.getDescription());
-
-        if (result != null) {
-            session.finishSession(result.isOk());
-            LOGGER.exit("Model/Create" + (result.isOk() ? OK : NOT_OK));
-        }
-        return result;
-    }
-
-    /**
-     * Update the model for this session.
-     *
-     * @param session the Apex model editing session
-     * @param jsonString the JSON string to be parsed containing the updated model. See {@linkplain BeanModel}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult updateModel(final RestSession session, final String jsonString) {
-        LOGGER.entry(jsonString);
-
-        final BeanModel jsonbean = RestUtils.getJsonParameters(jsonString, BeanModel.class);
-
-        session.editModel();
-
-        ApexApiResult result = session.getApexModelEdited().updateModel(jsonbean.getName(), jsonbean.getVersion(),
-                        jsonbean.getUuid(), jsonbean.getDescription());
-
-        if (result != null) {
-            session.finishSession(result.isOk());
-            LOGGER.exit("Model/Update" + (result.isOk() ? OK : NOT_OK));
-        }
-
-        return result;
-    }
-
-    /**
-     * Gets the key for the model for this session. If successful the model key will be available in the first message
-     * in the result. See {@linkplain AxKey}
-     *
-     * @param session the Apex model editing session
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult getModelKey(final RestSession session) {
-        LOGGER.entry();
-
-        ApexApiResult result = session.getApexModel().getModelKey();
-
-        LOGGER.exit("Model/GetKey" + (result != null && result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * Retrieve the model for this session. If successful the model will be available in the first message in the
-     * result. The returned value will be similar to a {@link AxPolicyModel}, with merged {@linkplain AxKeyInfo} for the
-     * root object.
-     *
-     * @param session the Apex model editing session
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult listModel(final RestSession session) {
-        LOGGER.entry();
-
-        ApexApiResult result = session.getApexModel().listModel();
-
-        if (result != null) {
-            result = addKeyInfo2Messages(session, result);
-            LOGGER.exit("Model/Get" + (result.isOk() ? OK : NOT_OK));
-        }
-        return result;
-    }
-
-    /**
-     * Download the model for this session as a String.
-     *
-     * @param session the Apex model editing session
-     * @return the model represented as a JSON string. See {@linkplain AxPolicyModel}
-     */
-    private ApexApiResult downloadModel(final RestSession session) {
-        LOGGER.entry();
-
-        ApexApiResult result = session.getApexModel().listModel();
-
-        LOGGER.exit("Model/Download" + (result != null && result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * Delete the model for this session.
-     *
-     * @param session the Apex model editing session
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult deleteModel(final RestSession session) {
-        LOGGER.entry();
-
-        session.editModel();
-
-        ApexApiResult result = session.getApexModel().deleteModel();
-
-        if (result != null) {
-            session.finishSession(result.isOk());
-            LOGGER.exit("Model/Delete" + (result.isOk() ? OK : NOT_OK));
-        }
-
-        return result;
-    }
-
-    /**
-     * The json strings representing the objects listed, stored in result.messages[], does not contain the
-     * AxKeyInformation for that object. This utility method retrieves the AxKeyInfo for each object and adds it to the
-     * json for the object.
-     *
-     * @param session the Apex model editing session
-     * @param incomingResult The list result, containing JSON representations of objects stored in its "messages" array
-     * @return The list result, containing JSON augmented representations of objects stored in its "messages" array
-     */
-    private ApexApiResult addKeyInfo2Messages(final RestSession session, final ApexApiResult incomingResult) {
-        final ApexApiResult result = new ApexApiResult(incomingResult.getResult());
-        result.setMessages(incomingResult.getMessages());
-
-        final List<String> messages = incomingResult.getMessages();
-        final List<String> augmentedMessages = new ArrayList<>(messages.size());
-
-        for (final String message : messages) {
-            augmentedMessages.add(addKeyInfo2Message(session, message));
-        }
-        result.setMessages(augmentedMessages);
-
-        if (messages.size() != augmentedMessages.size()) {
-            result.setResult(Result.OTHER_ERROR);
-            result.addMessage("Failed to add KeyInfo to all results. Results are not complete");
-        }
-
-        return result;
-    }
-
-    /**
-     * Augment a message with key information.
-     *
-     * @param session the Apex model editing session
-     * @param message The message to augment
-     * @return the augmented message
-     */
-    private String addKeyInfo2Message(final RestSession session, final String message) {
-        final Gson gson = new GsonBuilder().serializeNulls().enableComplexMapKeySerialization().create();
-
-        JsonObject jsonObject = gson.fromJson(message, JsonObject.class);
-        if (jsonObject == null) {
-            return message;
-        }
-
-        String name = readFieldFromJsonObject(jsonObject, NAME, null);
-        String version = readFieldFromJsonObject(jsonObject, VERSION, null);
-
-        if (name == null && version == null) {
-            JsonObject newJsonObject = getSubJsonObject(jsonObject);
-
-            if (newJsonObject != null) {
-                jsonObject = newJsonObject;
-                name = readFieldFromJsonObject(jsonObject, NAME, name);
-                version = readFieldFromJsonObject(jsonObject, VERSION, version);
-            }
-        }
-
-        if (name == null || version == null || !setUuidAndDescription(session, jsonObject, name, version)) {
-            jsonObject.addProperty(UUID, (String) null);
-            jsonObject.addProperty(DESCRIPTION, (String) null);
-        }
-
-        return gson.toJson(jsonObject);
-    }
-
-    /**
-     * Get an embedded JSON object for the given JSON object.
-     *
-     * @param jsonObject the input JSON object
-     * @return the embedded JSON object
-     */
-    private JsonObject getSubJsonObject(JsonObject jsonObject) {
-        if (jsonObject.entrySet() != null && !jsonObject.entrySet().isEmpty()) {
-            return (JsonObject) jsonObject.entrySet().iterator().next().getValue();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Condition a field so its key information can be looked up.
-     *
-     * @param jsonObject the object to query
-     * @param fieldTag the tag of the field to condition
-     * @param fieldValue the value of the field to condition
-     * @return field read from the json
-     */
-    private String readFieldFromJsonObject(final JsonObject jsonObject, final String fieldTag, final String value) {
-        String lookedupValue = value;
-
-        if (jsonObject != null && jsonObject.get(KEY) != null && jsonObject.get(KEY).isJsonObject()
-                        && jsonObject.getAsJsonObject(KEY).get(fieldTag) != null) {
-            lookedupValue = jsonObject.getAsJsonObject(KEY).get(fieldTag).getAsString();
-        } else if (jsonObject != null && jsonObject.get(POLICY_KEY) != null && jsonObject.get(POLICY_KEY).isJsonObject()
-                        && jsonObject.getAsJsonObject(POLICY_KEY).get(fieldTag) != null) {
-            lookedupValue = jsonObject.getAsJsonObject(POLICY_KEY).get(fieldTag).getAsString();
-        }
-        return lookedupValue;
-    }
-
-    /**
-     * Look up the UUID and description in the key information for a concept.
-     *
-     * @param session the Apex editor session
-     * @param jsonObject the JSON object to place the fields in
-     * @param name the concept name to look up
-     * @param version the concept version to look up
-     */
-    private boolean setUuidAndDescription(final RestSession session, JsonObject jsonObject, String name,
-                    String version) {
-        // Look up the key information for the name and version
-        JsonObject keyInfoJsonObject = lookupKeyInfo(session, name, version);
-        if (keyInfoJsonObject == null || keyInfoJsonObject.get(APEX_KEY_INFO) != null) {
-            return false;
-        }
-
-        if (keyInfoJsonObject.get(APEX_KEY_INFO).getAsJsonObject().get("UUID") != null) {
-            jsonObject.addProperty(UUID,
-                            keyInfoJsonObject.get(APEX_KEY_INFO).getAsJsonObject().get("UUID").getAsString());
-        } else {
-            jsonObject.addProperty(UUID, (String) null);
-        }
-
-        if (keyInfoJsonObject.get(APEX_KEY_INFO).getAsJsonObject().get(DESCRIPTION) != null) {
-            jsonObject.addProperty(DESCRIPTION,
-                            keyInfoJsonObject.get(APEX_KEY_INFO).getAsJsonObject().get(DESCRIPTION).getAsString());
-        } else {
-            jsonObject.addProperty(DESCRIPTION, (String) null);
-        }
-
-        return true;
-    }
-
-    /**
-     * Look up the key information for the given concept name and value.
-     *
-     * @param session the Apex editor session
-     * @param name the concept name to look up
-     * @param version the concept version to look up
-     * @return a JSON version of the concept key information
-     */
-    private JsonObject lookupKeyInfo(final RestSession session, final String name, final String version) {
-        final ApexApiResult keyInfoResult = session.getApexModel().listKeyInformation(name, version);
-        final List<String> keyInfoMessages = keyInfoResult.getMessages();
-
-        if (keyInfoResult.isNok() || keyInfoMessages == null || keyInfoMessages.isEmpty()) {
-            return null;
-        }
-
-        final Gson gson = new GsonBuilder().serializeNulls().enableComplexMapKeySerialization().create();
-        final String keyInfoJson = keyInfoMessages.get(0);
-        return gson.fromJson(keyInfoJson, JsonObject.class);
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/PolicyHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/PolicyHandler.java
deleted file mode 100644
index 994d4e6ac..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/PolicyHandler.java
+++ /dev/null
@@ -1,580 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-import java.util.Map;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanKeyRef;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanLogic;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanPolicy;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanState;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanStateOutput;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanStateTaskRef;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
-import org.onap.policy.apex.model.modelapi.ApexApiResult;
-import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
-import org.onap.policy.apex.model.policymodel.concepts.AxPolicy;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * This class handles commands on policies in Apex models.
- */
-public class PolicyHandler implements RestCommandHandler {
-    // Get a reference to the logger
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(PolicyHandler.class);
-
-    // Recurring string constants
-    private static final String OK = ": OK";
-    private static final String NOT_OK = ": Not OK";
-    private static final String POLICY_WAS_CREATED = "\". The policy was created, ";
-    private static final String POLICY_STATE_CREATED = "\". The policy and state were created, ";
-    private static final String POLICY_PARTIALLY_DEFINED = " The policy has only been partially defined.";
-    private static final String FOR_POLICY = "\" for policy \"";
-    private static final String IN_STATE = "\" in state \"";
-    private static final String POLICY_CREATED_STATE_ERROR = POLICY_WAS_CREATED
-                    + "but there was an error adding the state.";
-    private static final String POLICY_STATE_CREATED_OTHER_ERROR = POLICY_STATE_CREATED
-                    + "but there was an error adding the";
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command) {
-        return getUnsupportedCommandResultMessage(session, commandType, command);
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String jsonString) {
-
-        if (!RestCommandType.POLICY.equals(commandType)) {
-            return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-
-        switch (command) {
-            case CREATE:
-                return createPolicy(session, jsonString);
-            case UPDATE:
-                return updatePolicy(session, jsonString);
-            default:
-                return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String name, final String version) {
-        if (!RestCommandType.POLICY.equals(commandType)) {
-            return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-
-        switch (command) {
-            case LIST:
-                return listPolicies(session, name, version);
-            case DELETE:
-                return deletePolicy(session, name, version);
-            default:
-                return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-    }
-
-    /**
-     * Creates a policy with the information in the JSON string passed.
-     *
-     * @param session the Apex model editing session
-     * @param jsonString the JSON string to be parsed See {@linkplain BeanPolicy}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    public ApexApiResult createPolicy(final RestSession session, final String jsonString) {
-        LOGGER.entry(jsonString);
-
-        final BeanPolicy jsonbean = RestUtils.getJsonParameters(jsonString, BeanPolicy.class);
-
-        session.editModel();
-
-        ApexApiResult result = session.getApexModelEdited().createPolicy(jsonbean.getName(), jsonbean.getVersion(),
-                        jsonbean.getTemplate(), jsonbean.getFirstState(), jsonbean.getUuid(),
-                        jsonbean.getDescription());
-
-        if (result.isOk()) {
-            result = createPolicyContent(session, jsonbean);
-        }
-
-        session.finishSession(result.isOk());
-
-        LOGGER.exit("Policy/Create" + (result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * Create the content of the policy.
-     *
-     * @param session the Apex model editing session
-     * @param jsonString the JSON string to be parsed See {@linkplain BeanPolicy}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult createPolicyContent(RestSession session, BeanPolicy jsonbean) {
-        ApexApiResult result = new ApexApiResult();
-
-        if (jsonbean.getStates() == null || jsonbean.getStates().isEmpty()) {
-            result.setResult(Result.FAILED);
-            result.addMessage("Null or empty state map; no states defined for policy \"" + jsonbean.getName() + ":"
-                            + jsonbean.getVersion()
-                            + "\". The policy was created, but there was an error adding states."
-                            + POLICY_PARTIALLY_DEFINED);
-            return result;
-        }
-
-        // States reference each other so all states must be created before they are populated
-        for (final Map.Entry<String, BeanState> stateEntry : jsonbean.getStates().entrySet()) {
-            ApexApiResult stateCreateResult = createState(session, jsonbean.getName(), jsonbean.getVersion(),
-                            stateEntry.getKey(), stateEntry.getValue());
-
-            if (stateCreateResult.isNok()) {
-                result.setResult(stateCreateResult.getResult());
-                result.addMessage(stateCreateResult.getMessage());
-            }
-        }
-
-        // Bale out if the state creation did not work
-        if (result.isNok()) {
-            return result;
-        }
-
-        // Now create the content of each state
-        for (final Map.Entry<String, BeanState> stateEntry : jsonbean.getStates().entrySet()) {
-            ApexApiResult stateContentCreateResult = createStateContent(session, jsonbean.getName(),
-                            jsonbean.getVersion(), stateEntry.getKey(), stateEntry.getValue());
-
-            if (stateContentCreateResult.isNok()) {
-                result.setResult(stateContentCreateResult.getResult());
-                result.addMessage(stateContentCreateResult.getMessage());
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Create a state on the policy.
-     *
-     * @param session the Apex model editing session
-     * @param policyName the policy name
-     * @param policVersion the policy version
-     * @param stateName the name of the state
-     * @param stateBean the information on the state to create
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult createState(final RestSession session, final String policyName, final String policyVersion,
-                    final String stateName, final BeanState stateBean) {
-
-        if (stateBean == null) {
-            return new ApexApiResult(Result.FAILED,
-                            "Null or invalid state information for state \"" + stateName + FOR_POLICY + policyName + ":"
-                                            + policyVersion + POLICY_CREATED_STATE_ERROR + POLICY_PARTIALLY_DEFINED);
-        }
-
-        if (stateBean.getTrigger() == null) {
-            return new ApexApiResult(Result.FAILED,
-                            "Null or invalid state trigger for state \"" + stateName + FOR_POLICY + policyName + ":"
-                                            + policyVersion + POLICY_CREATED_STATE_ERROR + POLICY_PARTIALLY_DEFINED);
-        }
-
-        if (stateBean.getDefaultTask() == null) {
-            return new ApexApiResult(Result.FAILED, "Null or invalid default task for state \"" + stateName + FOR_POLICY
-                            + policyName + ":" + policyVersion + POLICY_CREATED_STATE_ERROR + POLICY_PARTIALLY_DEFINED);
-        }
-
-        return session.getApexModelEdited().createPolicyState(policyName, policyVersion, stateName,
-                        stateBean.getTrigger().getName(), stateBean.getTrigger().getVersion(),
-                        stateBean.getDefaultTask().getName(), stateBean.getDefaultTask().getVersion());
-    }
-
-    /**
-     * Create the content of a state on the policy.
-     *
-     * @param session the Apex model editing session
-     * @param policyName the policy name
-     * @param policVersion the policy version
-     * @param stateName the name of the state
-     * @param stateBean the information on the state to create
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult createStateContent(final RestSession session, final String policyName,
-                    final String policyVersion, final String stateName, final BeanState stateBean) {
-
-        ApexApiResult ret = createStateTaskSelectionLogic(session, policyName, policyVersion, stateName, stateBean);
-
-        if (ret.isOk()) {
-            ret = createStateContextReferences(session, policyName, policyVersion, stateName, stateBean);
-        }
-
-        if (ret.isOk()) {
-            ret = createStateFinalizers(session, policyName, policyVersion, stateName, stateBean);
-        }
-
-        if (ret.isOk()) {
-            ret = createStateOutputs(session, policyName, policyVersion, stateName, stateBean);
-        }
-
-        if (ret.isOk()) {
-            ret = createStateTaskReferences(session, policyName, policyVersion, stateName, stateBean);
-        }
-
-        return ret;
-    }
-
-    /**
-     * Create the task selection logic for the state.
-     *
-     * @param session the Apex model editing session
-     * @param policyName the policy name
-     * @param policVersion the policy version
-     * @param stateName the name of the state
-     * @param stateBean the information on the state to create
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult createStateTaskSelectionLogic(final RestSession session, final String policyName,
-                    final String policyVersion, final String stateName, final BeanState stateBean) {
-
-        final BeanLogic tsl = stateBean.getTaskSelectionLogic();
-        if (tsl == null) {
-            return new ApexApiResult();
-        }
-
-        ApexApiResult result = session.getApexModelEdited().createPolicyStateTaskSelectionLogic(policyName,
-                        policyVersion, stateName, tsl.getLogicFlavour(), tsl.getLogic());
-
-        if (result.isNok()) {
-            result.addMessage("Failed to add task selection logic for state \"" + stateName + "\" for" + " policy \""
-                            + policyName + ":" + policyVersion + POLICY_WAS_CREATED
-                            + "but there was an error adding the task selection logic "
-                            + "for the state. The policy has only been partially defined.");
-        }
-        return result;
-    }
-
-    /**
-     * Create the context references for the state.
-     *
-     * @param session the Apex model editing session
-     * @param policyName the policy name
-     * @param policVersion the policy version
-     * @param stateName the name of the state
-     * @param stateBean the information on the state to create
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult createStateContextReferences(final RestSession session, final String policyName,
-                    final String policyVersion, final String stateName, final BeanState stateBean) {
-
-        ApexApiResult result = new ApexApiResult();
-
-        final BeanKeyRef[] contextReferences = stateBean.getContexts();
-        if (contextReferences == null || contextReferences.length == 0) {
-            return result;
-        }
-
-        for (final BeanKeyRef contextReference : contextReferences) {
-            if (contextReference == null) {
-                result.setResult(Result.FAILED);
-                result.addMessage("Null or invalid context reference \"" + contextReference + "\" for" + " state \""
-                                + stateName + FOR_POLICY + policyName + ":" + policyVersion
-                                + "\". The policy was created, but there was an error adding the context "
-                                + "reference for the state. The policy has only been partially defined.");
-                continue;
-            }
-
-            ApexApiResult contextRefResult = session.getApexModelEdited().createPolicyStateContextRef(policyName,
-                            policyVersion, stateName, contextReference.getName(), contextReference.getVersion());
-
-            if (contextRefResult.isNok()) {
-                result.setResult(contextRefResult.getResult());
-                result.addMessage("Failed to add context reference \"" + contextReference + "\" for state \""
-                                + stateName + FOR_POLICY + policyName + ":" + policyVersion + POLICY_WAS_CREATED
-                                + "but there was an error adding the context reference "
-                                + "for the state. The policy has only been partially defined.");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Create the state finalizers for the state.
-     *
-     * @param session the Apex model editing session
-     * @param policyName the policy name
-     * @param policVersion the policy version
-     * @param stateName the name of the state
-     * @param stateBean the information on the state to create
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult createStateFinalizers(final RestSession session, final String policyName,
-                    final String policyVersion, final String stateName, final BeanState stateBean) {
-
-        ApexApiResult result = new ApexApiResult();
-
-        final Map<String, BeanLogic> finalizers = stateBean.getFinalizers();
-        if (finalizers == null || finalizers.isEmpty()) {
-            return result;
-        }
-
-        for (final Map.Entry<String, BeanLogic> finalizerEntry : finalizers.entrySet()) {
-            if (finalizerEntry.getKey() == null || finalizerEntry.getValue() == null) {
-                result.setResult(Result.FAILED);
-                result.addMessage("Null or invalid finalizer information for finalizer " + "named \""
-                                + finalizerEntry.getKey() + IN_STATE + stateName + FOR_POLICY + policyName + ":"
-                                + policyVersion + POLICY_STATE_CREATED_OTHER_ERROR + " finalizer. The policy has only "
-                                + "been partially defined.");
-                continue;
-            }
-
-            ApexApiResult finalizerResult = session.getApexModelEdited().createPolicyStateFinalizerLogic(policyName,
-                            policyVersion, stateName, finalizerEntry.getKey(),
-                            finalizerEntry.getValue().getLogicFlavour(), finalizerEntry.getValue().getLogic());
-
-            if (finalizerResult.isNok()) {
-                result.setResult(finalizerResult.getResult());
-                result.addMessage("Failed to add finalizer information for finalizer named \"" + finalizerEntry.getKey()
-                                + "\" in" + " state \"" + stateName + FOR_POLICY + policyName + ":" + policyVersion
-                                + POLICY_STATE_CREATED_OTHER_ERROR
-                                + " finalizer. The policy has only been partially defined.");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Create the state outputs for the state.
-     *
-     * @param session the Apex model editing session
-     * @param policyName the policy name
-     * @param policVersion the policy version
-     * @param stateName the name of the state
-     * @param stateBean the information on the state to create
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult createStateOutputs(final RestSession session, final String policyName,
-                    final String policyVersion, final String stateName, final BeanState stateBean) {
-
-        ApexApiResult result = new ApexApiResult();
-
-        final Map<String, BeanStateOutput> stateOutputs = stateBean.getStateOutputs();
-        if (stateOutputs == null || stateOutputs.isEmpty()) {
-            result.setResult(Result.FAILED);
-            result.addMessage("No state outputs have been defined in state \"" + stateName + FOR_POLICY + policyName
-                            + ":" + policyVersion
-                            + "\". The policy and state were created, but there was an error adding state"
-                            + " outputs. The policy has only been partially defined.");
-            return result;
-        }
-
-        for (final Map.Entry<String, BeanStateOutput> stateOutput : stateOutputs.entrySet()) {
-            final String outputName = stateOutput.getKey();
-            final BeanStateOutput output = stateOutput.getValue();
-
-            if (outputName == null || output == null || output.getEvent() == null) {
-                result.setResult(Result.FAILED);
-                result.addMessage("Null or invalid output information for output named \"" + outputName + IN_STATE
-                                + stateName + FOR_POLICY + policyName + ":" + policyVersion
-                                + POLICY_STATE_CREATED_OTHER_ERROR
-                                + " output. The policy has only been partially defined.");
-                continue;
-            }
-
-            ApexApiResult outputResult = session.getApexModelEdited().createPolicyStateOutput(policyName, policyVersion,
-                            stateName, outputName, output.getEvent().getName(), output.getEvent().getVersion(),
-                            output.getNextState());
-
-            if (outputResult.isNok()) {
-                result.setResult(outputResult.getResult());
-                result.addMessage("Failed to add output information for output named \"" + outputName + IN_STATE
-                                + stateName + FOR_POLICY + policyName + ":" + policyVersion + POLICY_STATE_CREATED
-                                + "but there was an error adding the output." + POLICY_PARTIALLY_DEFINED);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Create the task references for the state.
-     *
-     * @param session the Apex model editing session
-     * @param policyName the policy name
-     * @param policVersion the policy version
-     * @param stateName the name of the state
-     * @param stateBean the information on the state to create
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult createStateTaskReferences(final RestSession session, final String policyName,
-                    final String policyVersion, final String stateName, final BeanState stateBean) {
-
-        ApexApiResult result = new ApexApiResult();
-
-        final Map<String, BeanStateTaskRef> taskMap = stateBean.getTasks();
-        if (taskMap == null || taskMap.isEmpty()) {
-            result.setResult(Result.FAILED);
-            result.addMessage("No tasks have been defined in state \"" + stateName + FOR_POLICY + policyName + ":"
-                            + policyVersion
-                            + "\". The policy and state were created, but there was an error adding tasks."
-                            + POLICY_PARTIALLY_DEFINED);
-            return result;
-        }
-
-        for (final Map.Entry<String, BeanStateTaskRef> taskEntry : taskMap.entrySet()) {
-            final String taskLocalName = taskEntry.getKey();
-            final BeanStateTaskRef taskReference = taskEntry.getValue();
-
-            if (taskLocalName == null || taskReference == null || taskReference.getTask() == null) {
-                result.setResult(Result.FAILED);
-                result.addMessage("Null or invalid task information for task named \"" + taskLocalName + IN_STATE
-                                + stateName + "\" for for policy \"" + policyName + ":" + policyVersion
-                                + "\". The policy and state were created, but there was an error adding the "
-                                + "task. The policy has only been partially defined.");
-                continue;
-            }
-
-            ApexApiResult taskRefResult = session.getApexModelEdited().createPolicyStateTaskRef(policyName,
-                            policyVersion, stateName, taskLocalName, taskReference.getTask().getName(),
-                            taskReference.getTask().getVersion(), taskReference.getOutputType(),
-                            taskReference.getOutputName());
-
-            if (taskRefResult.isNok()) {
-                result.setResult(taskRefResult.getResult());
-                result.addMessage("Failed to add task reference \"" + taskEntry + "\" for state \"" + stateName
-                                + FOR_POLICY + policyName + ":" + policyVersion + POLICY_WAS_CREATED
-                                + "but there was an error adding the task reference for"
-                                + " the state. The policy has only been partially defined.");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Update a policy with the information in the JSON string passed.
-     *
-     * @param session the Apex model editing session
-     * @param jsonString the JSON string to be parsed. See {@linkplain BeanPolicy}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult updatePolicy(final RestSession session, final String jsonString) {
-
-        LOGGER.entry(jsonString);
-
-        final BeanPolicy jsonbean = RestUtils.getJsonParameters(jsonString, BeanPolicy.class);
-
-        if (blank2Null(jsonbean.getName()) == null || blank2Null(jsonbean.getVersion()) == null) {
-            LOGGER.exit("Task/Update" + NOT_OK);
-            return new ApexApiResult(Result.FAILED, "Null/Empty Policy name/version (\"" + jsonbean.getName() + ":"
-                            + jsonbean.getVersion() + "\" passed to UpdatePolicy");
-        }
-
-        session.editModel();
-
-        ApexApiResult result = session.getApexModelEdited().deletePolicy(jsonbean.getName(), jsonbean.getVersion());
-
-        if (result.isOk()) {
-            result = session.getApexModelEdited().createPolicy(jsonbean.getName(), jsonbean.getVersion(),
-                            jsonbean.getTemplate(), jsonbean.getFirstState(), jsonbean.getUuid(),
-                            jsonbean.getDescription());
-
-            if (result.isOk()) {
-                result = createPolicyContent(session, jsonbean);
-            }
-        }
-
-        session.finishSession(result.isOk());
-
-        LOGGER.exit("Policy/Update" + (result.isOk() ? OK : NOT_OK));
-        return result;
-
-    }
-
-    /**
-     * List policies with the given key names/versions. If successful the result(s) will be available in the result
-     * messages. The returned value(s) will be similar to {@link AxPolicy}, with merged {@linkplain AxKey Info} for the
-     * root object.
-     *
-     * @param session the Apex model editing session
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult listPolicies(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        ApexApiResult result = session.getApexModel().listPolicy(blank2Null(name), blank2Null(version));
-
-        LOGGER.exit("Policy/Get" + (result != null && result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * Delete policies with the given key names/versions.
-     *
-     * @param session the Apex model editing session
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult deletePolicy(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        session.editModel();
-
-        // all input/output fields, parameters, logic, context references is "owned"/contained
-        // in the task, so
-        // deleting the task removes all of these
-        ApexApiResult result = session.getApexModelEdited().deletePolicy(blank2Null(name), blank2Null(version));
-
-        if (result != null) {
-            session.finishSession(result.isOk());
-            LOGGER.exit("Policy/Delete" + (result.isOk() ? OK : NOT_OK));
-        }
-
-        return result;
-    }
-
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestCommand.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestCommand.java
deleted file mode 100644
index 7b1bc020d..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestCommand.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-/**
- * This enum maps REST calls to the handlers that process them.
- *
- */
-public enum RestCommand {
-    /**
-     * Create the target.
-     */
-    CREATE,
-    /**
-     * Update the target.
-     */
-    UPDATE,
-    /**
-     * List the target.
-     */
-    LIST,
-    /**
-     * Delete the target.
-     */
-    DELETE,
-    /**
-     * Validate the target.
-     */
-    VALIDATE,
-    /**
-     * Load the target.
-     */
-    LOAD,
-    /**
-     * Analyse the target.
-     */
-    ANALYSE,
-    /**
-     * Get the key of the currently loaded apex model.
-     */
-    GET_KEY,
-    /**
-     * Download the currently loaded apex model.
-     */
-    DOWNLOAD
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestCommandHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestCommandHandler.java
deleted file mode 100644
index 968a98572..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestCommandHandler.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-import org.onap.policy.apex.model.modelapi.ApexApiResult;
-import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
-
-/**
- * This interface defines the methods that a REST handler must implement to handle REST editor commands.
- *
- */
-public interface RestCommandHandler {
-
-    /**
-     * Process a REST command.
-     *
-     * @param session the Apex editor session
-     * @param commandType the type of REST command to execute
-     * @param command the REST command to execute
-     * @return the apex api result the result of the execution
-     */
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-            final RestCommand command);
-
-    /**
-     * Process a REST command.
-     *
-     * @param session the Apex editor session
-     * @param commandType the type of REST command to execute
-     * @param command the REST command to execute
-     * @param jsonString the json string to use to execute the command
-     * @return the apex api result the result of the execution
-     */
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-            final RestCommand command, final String jsonString);
-
-    /**
-     * Process a REST command.
-     *
-     * @param session the Apex editor session
-     * @param commandType the type of REST command to execute
-     * @param command the REST command to execute
-     * @param name the concept name on which to execute
-     * @param version the concept version the version on which to execute
-     * @return the apex api result the result of the execution
-     */
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-            final RestCommand command, final String name, final String version);
-
-    /**
-     * Get an unsupported command result message.
-     *
-     * @param session the Apex editor session
-     * @param commandType the type of REST command to execute
-     * @param command the REST command to execute
-     * @return the apex api result the result of the execution
-     */
-    public default ApexApiResult getUnsupportedCommandResultMessage(final RestSession session,
-            final RestCommandType commandType, final RestCommand command) {
-        return new ApexApiResult(Result.FAILED, "session " + session.getSessionId() + ", command type " + commandType
-                + ", command" + command + " invalid");
-    }
-
-    /**
-     * Convert blank incoming fields to nulls.
-     *
-     * @param incomingField the field to check
-     * @return null if the field is blank, otherwise, the field trimmed
-     */
-    public default String blank2Null(final String incomingField) {
-        if (incomingField == null) {
-            return null;
-        }
-
-        final String trimmedField = incomingField.trim();
-
-        if (trimmedField.isEmpty()) {
-            return null;
-        } else {
-            return trimmedField;
-        }
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestCommandType.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestCommandType.java
deleted file mode 100644
index c546cb02a..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestCommandType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-/**
- * This enum maps REST calls to the handlers that process them.
- *
- */
-public enum RestCommandType {
-    /**
-     * Model commands.
-     */
-    MODEL,
-    /**
-     * Key Information commands.
-     */
-    KEY_INFO,
-    /**
-     * Context schema commands.
-     */
-    CONTEXT_SCHEMA,
-    /**
-     * Context album commands.
-     */
-    CONTEXT_ALBUM,
-    /**
-     * Event Commands.
-     */
-    EVENT,
-    /**
-     * Task commands.
-     */
-    TASK,
-    /**
-     * Policy commands.
-     */
-    POLICY
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSession.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSession.java
deleted file mode 100644
index 46d57fd01..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSession.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-import org.onap.policy.apex.model.modelapi.ApexApiResult;
-import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
-import org.onap.policy.apex.model.modelapi.ApexModel;
-import org.onap.policy.apex.model.modelapi.ApexModelFactory;
-
-/**
- * This class represents an ongoing editor session in the Apex editor and holds the information for the session.
- *
- */
-public class RestSession {
-    // The ID of the session
-    private int sessionId;
-    
-    // The Apex policy model of the session
-    private ApexModel apexModel;
-
-    // The Apex policy model being edited
-    private ApexModel apexModelEdited;
-
-    public RestSession(final int sessionId) {
-        this.sessionId = sessionId;
-        this.apexModel = new ApexModelFactory().createApexModel(null, true);
-    }
-
-    /**
-     * Commence making changes to the Apex model.
-     * @return the result of the edit commencement operation
-     */
-    public synchronized ApexApiResult editModel() {
-        if (apexModelEdited != null) {
-            return new ApexApiResult(Result.FAILED, "model is already being edited");
-        }
-        
-        apexModelEdited = apexModel.clone();
-        return new ApexApiResult();
-    }
-    
-    /**
-     * Commit the changes to the Apex model.
-     * @return the result of the commit operation
-     */
-    public synchronized ApexApiResult commitChanges() {
-        if (apexModelEdited == null) {
-            return new ApexApiResult(Result.FAILED, "model is not being edited");
-        }
-        
-        apexModel = apexModelEdited;
-        apexModelEdited = null;
-        return new ApexApiResult();
-    }
-    
-    /**
-     * Discard the changes to the Apex model.
-     * @return the result of the discard operation
-     */
-    public synchronized ApexApiResult discardChanges() {
-        if (apexModelEdited == null) {
-            return new ApexApiResult(Result.FAILED, "model is not being edited");
-        }
-        
-        apexModelEdited = null;
-        return new ApexApiResult();
-    }
-    
-
-    /**
-     * Finish a session by committing or discarding the changes.
-     * 
-     * @param commitFlag if ture, commit changes otherwise discard them
-     */
-    public void finishSession(boolean commitFlag) {
-        if (commitFlag) {
-            commitChanges();
-        } else {
-            discardChanges();
-        }
-    }
-
-    /**
-     * Get the session ID of the session.
-     * @return the sessionId
-     */
-    public int getSessionId() {
-        return sessionId;
-    }
-
-    /**
-     * Get the Apex model of the session.
-     * @return the apexModel
-     */
-    public ApexModel getApexModel() {
-        return apexModel;
-    }
-
-    /**
-     * Get the edited Apex model of the session.
-     * @return the apexModel
-     */
-    public ApexModel getApexModelEdited() {
-        return apexModelEdited;
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSessionHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSessionHandler.java
deleted file mode 100644
index c6cfca845..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestSessionHandler.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.onap.policy.apex.model.modelapi.ApexApiResult;
-import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * This class carries out session handling for Apex REST editor sessions.
- */
-public class RestSessionHandler {
-    // Get a reference to the logger
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(RestSessionHandler.class);
-
-    // The next session will have this number, stating at 0
-    private AtomicInteger nextSessionId = new AtomicInteger();
-
-    // All REST editor sessions being handled by this handler
-    private final Map<Integer, RestSession> sessionMap = new TreeMap<>();
-
-    /**
-     * Create a new session.
-     * @param result the result of session creation
-     * @return the new session object
-     */
-    public RestSession createSession(ApexApiResult result) {
-        LOGGER.entry("creating session");
-        
-        // Create the session with the next session ID
-        final int newSessionId = nextSessionId.getAndIncrement();
-        sessionMap.put(newSessionId, new RestSession(newSessionId));
-
-        result.addMessage(Integer.toString(newSessionId));
-        
-        LOGGER.exit("created session with ID: " + newSessionId);
-        return sessionMap.get(newSessionId);
-    }
-
-    /**
-     * Get a session for the given session ID.
-     * @param sessionId the session ID of the session we require
-     * @param result the result of the session get
-     * @return the session
-     */
-    public RestSession getSession(final int sessionId, ApexApiResult result) {
-        LOGGER.entry("finding session: " + sessionId);
-
-        // Check for valid session IDs
-        if (sessionId < 0) {
-            result.setResult(Result.FAILED);
-            result.addMessage("Session ID  \"" + sessionId + "\" is negative");
-            LOGGER.exit(result.getMessage());
-            return null;
-        }
-
-        // Check if session exits
-        if (!sessionMap.containsKey(sessionId)) {
-            result.setResult(Result.FAILED);
-            result.addMessage("A session with session ID \"" + sessionId + "\" does not exist");
-            LOGGER.exit(result.getMessage());
-            return null;
-        }
-        
-        RestSession session = sessionMap.get(sessionId);
-        
-        // Check if session is valid
-        if (session == null) {
-            result.setResult(Result.FAILED);
-            result.addMessage("The session with session ID \"" + sessionId + "\" is corrupt");
-            LOGGER.exit(result.getMessage());
-            return null;
-        }
-        
-        // Return the session
-        LOGGER.exit("session found: " + sessionId);
-        return session;
-    }
-
-    /*
-     * This is a test method to set a corrupt session ID in the session map
-     * @param corruptSessionId the ID of the corrupt session
-     */
-    protected void setCorruptSession(int corruptSessionId) {
-        sessionMap.put(corruptSessionId, null);
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestUtils.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestUtils.java
deleted file mode 100644
index 55a07a30f..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/RestUtils.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonNull;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
-import java.io.StringReader;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-import javax.ws.rs.core.MediaType;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.transform.stream.StreamSource;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanBase;
-import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
-
-/**
- * Utilities for handling RESTful communication for Apex.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public abstract class RestUtils {
-    // Regular expressions for checking input types
-    private static final String XML_INPUT_TYPE_REGEXP = "^\\s*<\\?xml.*>\\s*"; // starts with <?xml...>
-    /**
-     * starts with some kind of bracket [ or ( or {, then has something, then has bracket.
-     */
-    private static final String JSON_INPUT_TYPE_REGEXP = "^\\s*[\\(\\{\\[][\\s+\\S]*[\\)\\}\\]]";
-
-    /**
-     * Constructor, block inheritance.
-     */
-    private RestUtils() {
-        // Private constructor to block subclassing
-    }
-
-    /**
-     * HTTP POST requests can't send nulls so we interpret blanks as nulls.
-     *
-     * @param parameter the parameter to convert from blank to null
-     * @return null if the parameter us blank, otherwise the original parameter
-     */
-    private static String blank2null(final String parameter) {
-        return (parameter.length() == 0 ? null : parameter);
-    }
-
-    /**
-     * HTTP POST requests can't send nulls so we interpret blanks as nulls.
-     *
-     * @param val the val
-     * @return null if the parameter us blank, otherwise the original parameter
-     */
-    private static JsonElement blank2null(final JsonElement val) {
-        if (val == null) {
-            return JsonNull.INSTANCE;
-        }
-        if (val.isJsonPrimitive() && ((JsonPrimitive) val).isString()) {
-            final String v = ((JsonPrimitive) val).getAsString();
-            if (v == null || "".equals(v)) {
-                return JsonNull.INSTANCE;
-            }
-        }
-        if (val.isJsonArray()) {
-            final JsonArray arr = val.getAsJsonArray();
-            for (int i = 0; i < arr.size(); i++) {
-                arr.set(i, blank2null(arr.get(i)));
-            }
-        }
-        if (val.isJsonObject()) {
-            final JsonObject o = val.getAsJsonObject();
-            for (final Entry<String, JsonElement> e : o.entrySet()) {
-                e.setValue(blank2null(e.getValue()));
-            }
-        }
-        return val;
-    }
-
-    /**
-     * Apex HTTP PUT requests send simple single level JSON strings, this method reads those strings into a map.
-     *
-     * @param jsonString the incoming JSON string
-     * @return a map of the JSON strings
-     */
-    public static Map<String, String> getJsonParameters(final String jsonString) {
-        final GsonBuilder gb = new GsonBuilder();
-        gb.serializeNulls().enableComplexMapKeySerialization();
-        final JsonObject jsonObject = gb.create().fromJson(jsonString, JsonObject.class);
-
-        final Map<String, String> jsonMap = new TreeMap<>();
-        for (final Entry<String, JsonElement> jsonEntry : jsonObject.entrySet()) {
-            jsonMap.put(jsonEntry.getKey(), (jsonEntry.getValue() == JsonNull.INSTANCE ? null
-                    : blank2null(jsonEntry.getValue().getAsString())));
-        }
-        return jsonMap;
-    }
-
-    /**
-     * Apex HTTP PUT requests send simple single level JSON strings, this method reads those strings into a map.
-     *
-     * @param <C> the generic type
-     * @param jsonString the incoming JSON string
-     * @param clz the clz
-     * @return a map of the JSON strings
-     */
-    public static <C extends BeanBase> C getJsonParameters(final String jsonString, final Class<C> clz) {
-        final GsonBuilder gb = new GsonBuilder();
-        gb.serializeNulls().enableComplexMapKeySerialization();
-        final JsonObject jsonObject = gb.create().fromJson(jsonString, JsonObject.class);
-
-        for (final Entry<String, JsonElement> jsonEntry : jsonObject.entrySet()) {
-            final JsonElement val = jsonEntry.getValue();
-            jsonEntry.setValue(blank2null(val));
-        }
-        return gb.create().fromJson(jsonObject, clz);
-    }
-
-    /**
-     * Gets the concept from JSON.
-     *
-     * @param <C> the generic type
-     * @param jsonString the json string
-     * @param clz the clz
-     * @return the concept from JSON
-     * @throws JAXBException the JAXB exception
-     */
-    public static <C extends AxConcept> C getConceptFromJson(final String jsonString, final Class<C> clz)
-            throws JAXBException {
-        Unmarshaller unmarshaller = null;
-        final JAXBContext jaxbContext = JAXBContext.newInstance(clz);
-        unmarshaller = jaxbContext.createUnmarshaller();
-        if (jsonString.matches(JSON_INPUT_TYPE_REGEXP)) {
-            unmarshaller.setProperty(MarshallerProperties.MEDIA_TYPE, MediaType.APPLICATION_JSON);
-            unmarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, true);
-        } else if (jsonString.matches(XML_INPUT_TYPE_REGEXP)) {
-            unmarshaller.setProperty(MarshallerProperties.MEDIA_TYPE, MediaType.APPLICATION_XML);
-        } else {
-            return null;
-        }
-        final StreamSource source = new StreamSource(new StringReader(jsonString));
-        final JAXBElement<C> rootElement = unmarshaller.unmarshal(source, clz);
-        return rootElement.getValue();
-    }
-
-    /**
-     * Gets the JSO nfrom concept.
-     *
-     * @param object the object
-     * @return the JSO nfrom concept
-     */
-    public static String getJsonfromConcept(final Object object) {
-        final GsonBuilder gb = new GsonBuilder();
-        gb.serializeNulls().enableComplexMapKeySerialization();
-        return gb.create().toJson(object);
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/TaskHandler.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/TaskHandler.java
deleted file mode 100644
index 3854c6ffb..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/TaskHandler.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-import java.util.Map.Entry;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanField;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanKeyRef;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanLogic;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanTask;
-import org.onap.policy.apex.client.editor.rest.handling.bean.BeanTaskParameter;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo;
-import org.onap.policy.apex.model.modelapi.ApexApiResult;
-import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
-import org.onap.policy.apex.model.policymodel.concepts.AxTask;
-import org.slf4j.ext.XLogger;
-import org.slf4j.ext.XLoggerFactory;
-
-/**
- * This class handles commands on tasks in Apex models.
- */
-public class TaskHandler implements RestCommandHandler {
-    // Get a reference to the logger
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(TaskHandler.class);
-
-    // Recurring string constants
-    private static final String OK = ": OK";
-    private static final String NOT_OK = ": Not OK";
-    private static final String IN_TASK = "\" in task ";
-    private static final String TASK_PARTIALLY_DEFINED = " The task has only been partially defined.";
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command) {
-        return getUnsupportedCommandResultMessage(session, commandType, command);
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String jsonString) {
-        if (!RestCommandType.TASK.equals(commandType)) {
-            return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-
-        switch (command) {
-            case CREATE:
-                return createTask(session, jsonString);
-            case UPDATE:
-                return updateTask(session, jsonString);
-            default:
-                return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public ApexApiResult executeRestCommand(final RestSession session, final RestCommandType commandType,
-                    final RestCommand command, final String name, final String version) {
-        if (!RestCommandType.TASK.equals(commandType)) {
-            return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-
-        switch (command) {
-            case LIST:
-                return listTasks(session, name, version);
-            case DELETE:
-                return deleteTask(session, name, version);
-            case VALIDATE:
-                return validateTask(session, name, version);
-            default:
-                return getUnsupportedCommandResultMessage(session, commandType, command);
-        }
-    }
-
-    /**
-     * Creates a task with the information in the JSON string passed.
-     *
-     * @param session the Apex model editing session
-     * @param jsonString the JSON string to be parsed. See {@linkplain BeanTask}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult createTask(final RestSession session, final String jsonString) {
-        LOGGER.entry(jsonString);
-
-        final BeanTask jsonbean = RestUtils.getJsonParameters(jsonString, BeanTask.class);
-
-        session.editModel();
-
-        ApexApiResult result = session.getApexModelEdited().createTask(jsonbean.getName(), jsonbean.getVersion(),
-                        jsonbean.getUuid(), jsonbean.getDescription());
-
-        if (result.isOk()) {
-            result = createTaskContent(session, jsonbean);
-        }
-
-        session.finishSession(result.isOk());
-
-        LOGGER.exit("Task/Create" + (result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * Create the content of the task.
-     *
-     * @param session the Apex model editing session
-     * @param jsonString the JSON string to be parsed. See {@linkplain BeanTask}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult createTaskContent(final RestSession session, final BeanTask jsonbean) {
-        ApexApiResult result = createInputFields(session, jsonbean);
-
-        if (result.isOk()) {
-            result = createOutputFields(session, jsonbean);
-        }
-
-        if (result.isOk()) {
-            result = createTaskLogic(session, jsonbean);
-        }
-
-        if (result.isOk()) {
-            result = createTaskParameters(session, jsonbean);
-        }
-
-        if (result.isOk()) {
-            result = createContextReferences(session, jsonbean);
-        }
-        return result;
-    }
-
-    /**
-     * Create the input fields for the task.
-     *
-     * @param session the Apex model editing session
-     * @param jsonbean the ban containing the fields
-     * @return the result of the operation
-     */
-    private ApexApiResult createInputFields(final RestSession session, final BeanTask jsonbean) {
-        ApexApiResult result = new ApexApiResult();
-
-        if (jsonbean.getInputFields() == null || jsonbean.getInputFields().isEmpty()) {
-            return result;
-        }
-
-        for (final Entry<String, BeanField> fieldEntry : jsonbean.getInputFields().entrySet()) {
-            if (fieldEntry.getValue() == null) {
-                result.setResult(Result.FAILED);
-                result.addMessage("Null task input field information for field \"" + fieldEntry.getKey() + IN_TASK
-                                + jsonbean.getName() + ":" + jsonbean.getVersion()
-                                + ". The task was created, but there was an error adding the input fields."
-                                + TASK_PARTIALLY_DEFINED);
-                continue;
-            }
-
-            if (fieldEntry.getKey() == null || !fieldEntry.getKey().equals(fieldEntry.getValue().getLocalName())) {
-                result.setResult(Result.FAILED);
-                result.addMessage("Invalid task input field information for field \"" + fieldEntry.getKey() + IN_TASK
-                                + jsonbean.getName() + ":" + jsonbean.getVersion() + ". The localName of the field (\""
-                                + fieldEntry.getValue().getLocalName() + "\") is not the same as the field name. "
-                                + "The task was created, but there was an error adding the input fields."
-                                + TASK_PARTIALLY_DEFINED);
-            } else {
-                ApexApiResult fieldCreationResult = session.getApexModelEdited().createTaskInputField(
-                                jsonbean.getName(), jsonbean.getVersion(), fieldEntry.getKey(),
-                                fieldEntry.getValue().getName(), fieldEntry.getValue().getVersion(),
-                                fieldEntry.getValue().getOptional());
-
-                if (fieldCreationResult.isNok()) {
-                    result.setResult(fieldCreationResult.getResult());
-                    result.addMessage("Failed to add task input field information for field \"" + fieldEntry.getKey()
-                                    + IN_TASK + jsonbean.getName() + ":" + jsonbean.getVersion()
-                                    + ". The task was created, but there was an error adding the input fields."
-                                    + TASK_PARTIALLY_DEFINED);
-                }
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Create the output fields for the task.
-     *
-     * @param session the Apex model editing session
-     * @param jsonbean the ban containing the fields
-     * @return the result of the operation
-     */
-    private ApexApiResult createOutputFields(final RestSession session, final BeanTask jsonbean) {
-        ApexApiResult result = new ApexApiResult();
-
-        if (jsonbean.getOutputFields() == null || jsonbean.getOutputFields().isEmpty()) {
-            return result;
-        }
-
-        for (final Entry<String, BeanField> fieldEntry : jsonbean.getOutputFields().entrySet()) {
-            if (fieldEntry.getValue() == null) {
-                result.setResult(Result.FAILED);
-                result.addMessage("Null task output field information for field \"" + fieldEntry.getKey() + IN_TASK
-                                + jsonbean.getName() + ":" + jsonbean.getVersion()
-                                + ". The task was created, but there was an error adding the output fields."
-                                + TASK_PARTIALLY_DEFINED);
-                continue;
-            }
-
-            if (fieldEntry.getKey() == null || !fieldEntry.getKey().equals(fieldEntry.getValue().getLocalName())) {
-                result.setResult(Result.FAILED);
-                result.addMessage("Invalid task output field information for field \"" + fieldEntry.getKey() + IN_TASK
-                                + jsonbean.getName() + ":" + jsonbean.getVersion() + ". The localName of the field (\""
-                                + fieldEntry.getValue().getLocalName() + "\") is not the same as the field name. "
-                                + "The task was created, but there was an error adding the output fields."
-                                + TASK_PARTIALLY_DEFINED);
-            } else {
-                ApexApiResult fieldCreationResult = session.getApexModelEdited().createTaskOutputField(
-                                jsonbean.getName(), jsonbean.getVersion(), fieldEntry.getKey(),
-                                fieldEntry.getValue().getName(), fieldEntry.getValue().getVersion(),
-                                fieldEntry.getValue().getOptional());
-                if (fieldCreationResult.isNok()) {
-                    result.setResult(fieldCreationResult.getResult());
-                    result.addMessage("Failed to add task output field information for field \"" + fieldEntry.getKey()
-                                    + IN_TASK + jsonbean.getName() + ":" + jsonbean.getVersion()
-                                    + ". The task was created, but there was an error adding the output fields."
-                                    + TASK_PARTIALLY_DEFINED);
-                }
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Create the task logic for the task.
-     *
-     * @param session the Apex model editing session
-     * @param jsonbean the bean containing the logic
-     * @return the result of the operation
-     */
-    private ApexApiResult createTaskLogic(final RestSession session, final BeanTask jsonbean) {
-        ApexApiResult result = new ApexApiResult();
-
-        if (jsonbean.getTaskLogic() == null) {
-            return result;
-        }
-
-        final BeanLogic logic = jsonbean.getTaskLogic();
-        result = session.getApexModelEdited().createTaskLogic(jsonbean.getName(), jsonbean.getVersion(),
-                        logic.getLogicFlavour(), logic.getLogic());
-
-        if (result.isNok()) {
-            result.addMessage("Failed to add task logic in task " + jsonbean.getName() + ":" + jsonbean.getVersion()
-                            + ". The task was created, but there was an error adding the logic."
-                            + TASK_PARTIALLY_DEFINED);
-        }
-
-        return result;
-    }
-
-    /**
-     * Create the task parameters for the task.
-     *
-     * @param session the Apex model editing session
-     * @param jsonbean the bean containing the parameters
-     * @return the result of the operation
-     */
-    private ApexApiResult createTaskParameters(final RestSession session, final BeanTask jsonbean) {
-        ApexApiResult result = new ApexApiResult();
-
-        if (jsonbean.getParameters() == null || jsonbean.getParameters().isEmpty()) {
-            return result;
-        }
-
-        for (final Entry<String, BeanTaskParameter> parameterEntry : jsonbean.getParameters().entrySet()) {
-            if (parameterEntry.getKey() == null || parameterEntry.getValue() == null
-                            || !parameterEntry.getKey().equals(parameterEntry.getValue().getParameterName())) {
-                result.setResult(Result.FAILED);
-                result.addMessage("Null or invalid task parameter information for parameter \""
-                                + parameterEntry.getKey() + IN_TASK + jsonbean.getName() + ":" + jsonbean.getVersion()
-                                + ". The task was created, " + "but there was an error adding the parameters."
-                                + TASK_PARTIALLY_DEFINED);
-                continue;
-            }
-            ApexApiResult createParResult = session.getApexModelEdited().createTaskParameter(jsonbean.getName(),
-                            jsonbean.getVersion(), parameterEntry.getValue().getParameterName(),
-                            parameterEntry.getValue().getDefaultValue());
-            if (createParResult.isNok()) {
-                result.setResult(createParResult.getResult());
-                result.addMessage("Failed to add task parameter \"" + parameterEntry.getKey() + IN_TASK
-                                + jsonbean.getName() + ":" + jsonbean.getVersion()
-                                + ". The task was created, but there was an error adding the parameters."
-                                + TASK_PARTIALLY_DEFINED);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Create the context references for the task.
-     *
-     * @param session the Apex model editing session
-     * @param jsonbean the bean containing the context references
-     * @return the result of the operation
-     */
-    private ApexApiResult createContextReferences(final RestSession session, final BeanTask jsonbean) {
-        ApexApiResult result = new ApexApiResult();
-
-        if (jsonbean.getContexts() == null || jsonbean.getContexts().length == 0) {
-            return result;
-        }
-
-        for (final BeanKeyRef contextalbum : jsonbean.getContexts()) {
-            if (contextalbum.getName() == null || contextalbum.getVersion() == null) {
-                result.setResult(Result.FAILED);
-                result.addMessage("Null or invalid context album reference information in task " + jsonbean.getName()
-                                + ":" + jsonbean.getVersion()
-                                + ". The task was created, but there was an error adding the"
-                                + " context album reference. " + "The task has only been partially defined.");
-                continue;
-            }
-            ApexApiResult createRefResult = session.getApexModelEdited().createTaskContextRef(jsonbean.getName(),
-                            jsonbean.getVersion(), contextalbum.getName(), contextalbum.getVersion());
-            if (createRefResult.isNok()) {
-                result.setResult(createRefResult.getResult());
-                result.addMessage("Failed to add context album reference information in task " + jsonbean.getName()
-                                + ":" + jsonbean.getVersion()
-                                + ". The task was created, but there was an error adding the"
-                                + " context album reference. " + "The task has only been partially defined.");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Update a task with the information in the JSON string passed.
-     *
-     * @param session the Apex model editing session
-     * @param jsonString the JSON string to be parsed. See {@linkplain BeanTask}
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult updateTask(final RestSession session, final String jsonString) {
-        LOGGER.entry(jsonString);
-
-        final BeanTask jsonbean = RestUtils.getJsonParameters(jsonString, BeanTask.class);
-
-        if (blank2Null(jsonbean.getName()) == null || blank2Null(jsonbean.getVersion()) == null) {
-            LOGGER.exit("Task/Update" + NOT_OK);
-            return new ApexApiResult(Result.FAILED, "Null/Empty task name/version (\"" + jsonbean.getName() + ":"
-                            + jsonbean.getVersion() + "\" passed to UpdateTask");
-        }
-
-        session.editModel();
-
-        ApexApiResult result = session.getApexModelEdited().deleteTask(jsonbean.getName(), jsonbean.getVersion());
-
-        if (result.isOk()) {
-            result = session.getApexModelEdited().createTask(jsonbean.getName(), jsonbean.getVersion(),
-                            jsonbean.getUuid(), jsonbean.getDescription());
-
-            if (result.isOk()) {
-                result = createTaskContent(session, jsonbean);
-            }
-        }
-
-        session.finishSession(result.isOk());
-
-        LOGGER.exit("Task/Update" + (result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * List tasks with the given key names/versions. If successful the result(s) will be available in the result
-     * messages. The returned value(s) will be similar to {@link AxTask}, with merged {@linkplain AxKeyInfo} for the
-     * root object.
-     *
-     * @param session the Apex model editing session
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult listTasks(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        ApexApiResult result = session.getApexModel().listTask(blank2Null(name), blank2Null(version));
-
-        LOGGER.exit("Task/Get" + (result != null && result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-
-    /**
-     * Delete tasks with the given key names/versions.
-     *
-     * @param session the Apex model editing session
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult deleteTask(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        session.editModel();
-
-        // all input/output fields, parameters, logic, context references is "owned"/contained
-        // in the task, so
-        // deleting the task removes all of these
-        ApexApiResult result = session.getApexModelEdited().deleteTask(blank2Null(name), blank2Null(version));
-
-        if (result != null) {
-            session.finishSession(result.isOk());
-            LOGGER.exit("Task/Delete" + (result.isOk() ? OK : NOT_OK));
-        }
-
-        return result;
-    }
-
-    /**
-     * Validate tasks with the given key names/versions. The result(s) will be available in the result messages.
-     *
-     * @param session the Apex model editing session
-     * @param name the name to search for. If null or empty, then all names will be queried
-     * @param version the version to search for. If null then all versions will be searched for.
-     * @return an ApexAPIResult object. If successful then {@link ApexApiResult#isOk()} will return true. Any
-     *         messages/errors can be retrieved using {@link ApexApiResult#getMessages()}
-     */
-    private ApexApiResult validateTask(final RestSession session, final String name, final String version) {
-        LOGGER.entry(name, version);
-
-        ApexApiResult result = session.getApexModel().validateTask(blank2Null(name), blank2Null(version));
-
-        LOGGER.exit("Validate/Task" + (result != null && result.isOk() ? OK : NOT_OK));
-        return result;
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanBase.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanBase.java
deleted file mode 100644
index 6ac5c48e1..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanBase.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-/**
- * The base class for Beans.
- */
-public abstract class BeanBase {
-    // Recurring string constants
-    private static final String PROBLEM_RETRIEVING_FIELD_PREFIX = "Problem retrieving field called ('";
-    private static final String JSON_BEAN_SUFFIX = "') from JSON bean ";
-
-    // Magic numbers
-    private static final int GET_LENGTH = 3;
-
-    /**
-     * Gets a named field from the bean.
-     *
-     * @param field the field name
-     * @return the value for the field
-     */
-    public String get(final String field) {
-        // use getter preferably
-        for (final Method method : this.getClass().getMethods()) {
-            if (method.getName().startsWith("get") && method.getName().length() == (field.length() + GET_LENGTH)
-                            && method.getName().toLowerCase().endsWith(field.toLowerCase())) {
-                return invokeGetterMethod(field, method);
-            }
-        }
-
-        // Use field approach
-        if (field != null) {
-            try {
-                final Field f = this.getClass().getDeclaredField(field);
-                if (f != null) {
-                    f.setAccessible(true);
-                    return (String) (f.get(this));
-                }
-            } catch (final Exception e) {
-                throw new IllegalArgumentException(PROBLEM_RETRIEVING_FIELD_PREFIX + field + JSON_BEAN_SUFFIX + this,
-                                e);
-            }
-        }
-        throw new IllegalArgumentException(PROBLEM_RETRIEVING_FIELD_PREFIX + field + JSON_BEAN_SUFFIX + this);
-    }
-
-    /**
-     * Invoke a getter method on a bean.
-     * 
-     * @param field the field that the getter gets a value for
-     * @param method the method to invoke
-     */
-    private String invokeGetterMethod(final String field, final Method method) {
-        try {
-            return (String) method.invoke(this);
-        } catch (final Exception e) {
-            throw new IllegalArgumentException(PROBLEM_RETRIEVING_FIELD_PREFIX + field + JSON_BEAN_SUFFIX + this, e);
-        }
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextAlbum.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextAlbum.java
deleted file mode 100644
index 4808a6531..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextAlbum.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The ContextAlbum Bean.
- */
-@XmlType
-public class BeanContextAlbum extends BeanBase {
-    private String name = null;
-    private String version = null;
-    private String scope = null;
-    private String uuid = null;
-    private String description = null;
-    private BeanKeyRef itemSchema = null;
-    private boolean writeable;
-
-    /**
-     * Gets the name.
-     *
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Gets the version.
-     *
-     * @return the version
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Gets the scope.
-     *
-     * @return the scope
-     */
-    public String getScope() {
-        return scope;
-    }
-
-    /**
-     * Gets the uuid.
-     *
-     * @return the uuid
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Gets the description.
-     *
-     * @return the description
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Gets the item schema.
-     *
-     * @return the item schema
-     */
-    public BeanKeyRef getItemSchema() {
-        return itemSchema;
-    }
-
-    /**
-     * Gets the writeable.
-     *
-     * @return the writeable
-     */
-    public boolean getWriteable() {
-        return writeable;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        return "ContextAlbum [name=" + name + ", version=" + version + ", scope=" + scope + ", uuid=" + uuid
-                + ", description=" + description + ", itemSchema=" + itemSchema + ", writeable=" + writeable + "]";
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextSchema.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextSchema.java
deleted file mode 100644
index 20ac61709..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanContextSchema.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The ContextSchema Bean.
- */
-@XmlType
-public class BeanContextSchema extends BeanBase {
-    private String name = null;
-    private String version = null;
-    private String schemaFlavour = null;
-    private String schemaDefinition = null;
-    private String uuid = null;
-    private String description = null;
-
-    /**
-     * Gets the name.
-     *
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Gets the version.
-     *
-     * @return the version
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Gets the uuid.
-     *
-     * @return the uuid
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Gets the description.
-     *
-     * @return the description
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Gets the schema flavour.
-     *
-     * @return the schema flavour
-     */
-    public String getSchemaFlavour() {
-        return schemaFlavour;
-    }
-
-    /**
-     * Gets the schema definition.
-     *
-     * @return the schema definition
-     */
-    public String getSchemaDefinition() {
-        return schemaDefinition;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        return "ContextSchema [name=" + name + ", version=" + version + ", schemaFlavour=" + schemaFlavour
-                + ", schemaDefinition=" + schemaDefinition + ", uuid=" + uuid + ", description=" + description + "]";
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanEvent.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanEvent.java
deleted file mode 100644
index 0d2ad737b..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanEvent.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import java.util.Map;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The Event Bean.
- */
-@XmlType
-public class BeanEvent extends BeanBase {
-    private String name = null;
-    private String version = null;
-    private String nameSpace = null;
-    private String source = null;
-    private String target = null;
-    private String uuid = null;
-    private String description = null;
-    private Map<String, BeanField> parameters = null;
-
-    /**
-     * Gets the name.
-     *
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Gets the version.
-     *
-     * @return the version
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Gets the name space.
-     *
-     * @return the name space
-     */
-    public String getNameSpace() {
-        return nameSpace;
-    }
-
-    /**
-     * Gets the source.
-     *
-     * @return the source
-     */
-    public String getSource() {
-        return source;
-    }
-
-    /**
-     * Gets the target.
-     *
-     * @return the target
-     */
-    public String getTarget() {
-        return target;
-    }
-
-    /**
-     * Gets the uuid.
-     *
-     * @return the uuid
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Gets the description.
-     *
-     * @return the description
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Gets the parameters.
-     *
-     * @return the parameters
-     */
-    public Map<String, BeanField> getParameters() {
-        return parameters;
-    }
-
-    /**
-     * Gets the parameter.
-     *
-     * @param ps the parameter string
-     * @return the parameter
-     */
-    public BeanField getParameter(final String ps) {
-        if (parameters != null) {
-            return parameters.get(ps);
-        }
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        return "Event [name=" + name + ", version=" + version + ", nameSpace=" + nameSpace + ", source=" + source
-                + ", target=" + target + ", uuid=" + uuid + ", description=" + description + ", parameters="
-                + getParameters() + "]";
-    }
-
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanField.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanField.java
deleted file mode 100644
index 472f94f2b..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanField.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The Field Bean.
- */
-@XmlType
-public class BeanField extends BeanKeyRef {
-
-    private boolean optional = true;
-    private String localName = null;
-
-    /**
-     * Gets the local name for this field.
-     *
-     * @return the local name for this field.
-     */
-    public String getLocalName() {
-        return localName;
-    }
-
-    /**
-     * Gets the optional flag.
-     *
-     * @return the optional flag
-     */
-    public boolean getOptional() {
-        return optional;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        return "Field [localName=" + getLocalName() + ", name=" + getName() + ", version=" + getVersion()
-                + ", optional=" + getOptional() + "]";
-    }
-
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanKeyRef.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanKeyRef.java
deleted file mode 100644
index d9c0269e2..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanKeyRef.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The Key Reference Bean.
- */
-@XmlType
-public class BeanKeyRef extends BeanBase {
-    private String name = null;
-    private String version = null;
-
-    /**
-     * Gets the name.
-     *
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Gets the version.
-     *
-     * @return the version
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        return "KeyRef [name=" + name + ", version=" + version + "]";
-    }
-
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanLogic.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanLogic.java
deleted file mode 100644
index ea61492a0..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanLogic.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The Logic Bean.
- */
-@XmlType
-public class BeanLogic extends BeanBase {
-    private String logic = null;
-    private String logicFlavour = null;
-
-    /**
-     * Gets the logic flavour.
-     *
-     * @return the logic flavour
-     */
-    public String getLogicFlavour() {
-        return logicFlavour;
-    }
-
-    /**
-     * Gets the logic.
-     *
-     * @return the logic
-     */
-    public String getLogic() {
-        return logic;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        return "Logic [logicFlavour=" + logicFlavour + ", logic=" + logic + "]";
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanModel.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanModel.java
deleted file mode 100644
index d65cbe7a9..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanModel.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The Model Bean.
- */
-@XmlType
-public class BeanModel extends BeanBase {
-
-    private String name = null;
-    private String version = null;
-    private String uuid = null;
-    private String description = null;
-
-    /**
-     * Gets the name.
-     *
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Gets the version.
-     *
-     * @return the version
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Gets the uuid.
-     *
-     * @return the uuid
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Gets the description.
-     *
-     * @return the description
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        return "Model [name=" + name + ", version=" + version + ", uuid=" + uuid + ", description=" + description + "]";
-    }
-
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanPolicy.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanPolicy.java
deleted file mode 100644
index a3a4194f9..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanPolicy.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import java.util.Map;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The Policy Bean.
- */
-@XmlType
-public class BeanPolicy extends BeanBase {
-    private String name = null;
-    private String version = null;
-    private String uuid = null;
-    private String description = null;
-    private String firstState = null;
-    private String template = null;
-    private Map<String, BeanState> states = null;
-
-    /**
-     * Gets the name.
-     *
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Gets the version.
-     *
-     * @return the version
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Gets the uuid.
-     *
-     * @return the uuid
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Gets the description.
-     *
-     * @return the description
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Gets the first state.
-     *
-     * @return the first state
-     */
-    public String getFirstState() {
-        return firstState;
-    }
-
-    /**
-     * Gets the template.
-     *
-     * @return the template
-     */
-    public String getTemplate() {
-        return template;
-    }
-
-    /**
-     * Gets the states.
-     *
-     * @return the states
-     */
-    public Map<String, BeanState> getStates() {
-        return states;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        return "Policy [name=" + name + ", version=" + version + ", uuid=" + uuid + ", description=" + description
-                + ", firstState=" + firstState + ", template=" + template + ", states=" + states + "]";
-    }
-
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanState.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanState.java
deleted file mode 100644
index 575511be6..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanState.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import java.util.Arrays;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The State Bean.
- */
-@XmlType
-public class BeanState extends BeanBase {
-
-    private String name = null;
-    private BeanKeyRef trigger = null;
-    private BeanKeyRef defaultTask = null;
-    private BeanKeyRef[] contexts = null;
-    private BeanLogic taskSelectionLogic = null;
-    private Map<String, BeanStateTaskRef> tasks = null;
-    private Map<String, BeanLogic> finalizers = null;
-    private Map<String, BeanStateOutput> stateOutputs = null;
-
-    /**
-     * Gets the name.
-     *
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Gets the trigger.
-     *
-     * @return the trigger
-     */
-    public BeanKeyRef getTrigger() {
-        return trigger;
-    }
-
-    /**
-     * Gets the contexts.
-     *
-     * @return the contexts
-     */
-    public BeanKeyRef[] getContexts() {
-        return contexts;
-    }
-
-    /**
-     * Gets the task selection logic.
-     *
-     * @return the task selection logic
-     */
-    public BeanLogic getTaskSelectionLogic() {
-        return taskSelectionLogic;
-    }
-
-    /**
-     * Gets the tasks.
-     *
-     * @return the tasks
-     */
-    public Map<String, BeanStateTaskRef> getTasks() {
-        return tasks;
-    }
-
-    /**
-     * Gets the finalizers.
-     *
-     * @return the finalizers
-     */
-    public Map<String, BeanLogic> getFinalizers() {
-        return finalizers;
-    }
-
-    /**
-     * Gets the state outputs.
-     *
-     * @return the state outputs
-     */
-    public Map<String, BeanStateOutput> getStateOutputs() {
-        return stateOutputs;
-    }
-
-    /**
-     * Gets the default task.
-     *
-     * @return the default task
-     */
-    public BeanKeyRef getDefaultTask() {
-        return defaultTask;
-    }
-
-    /**
-     * Sets the default task.
-     *
-     * @param defaultTask the new default task
-     */
-    public void setDefaultTask(final BeanKeyRef defaultTask) {
-        this.defaultTask = defaultTask;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        return "State [name=" + name + ", trigger=" + trigger + ", defaultTask=" + defaultTask + ", contexts="
-                + Arrays.toString(contexts) + ", taskSelectionLogic=" + taskSelectionLogic + ", tasks=" + tasks
-                + ", finalizers=" + finalizers + ", stateOutputs=" + stateOutputs + "]";
-    }
-
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateOutput.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateOutput.java
deleted file mode 100644
index a01a05221..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateOutput.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The StateOutput Bean.
- */
-@XmlType
-public class BeanStateOutput extends BeanBase {
-
-    private BeanKeyRef event = null;
-    private String nextState = null;
-
-    /**
-     * Gets the event.
-     *
-     * @return the event
-     */
-    public BeanKeyRef getEvent() {
-        return event;
-    }
-
-    /**
-     * Gets the next state.
-     *
-     * @return the next state
-     */
-    public String getNextState() {
-        return nextState;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        return "StateOutput [event=" + event + ", nextState=" + nextState + "]";
-    }
-
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateTaskRef.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateTaskRef.java
deleted file mode 100644
index 87396c4ed..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanStateTaskRef.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The State Task Reference Bean.
- */
-@XmlType
-public class BeanStateTaskRef extends BeanBase {
-    private BeanKeyRef task = null;
-    private String outputType = null;
-    private String outputName = null;
-
-    /**
-     * Gets the task.
-     *
-     * @return the task
-     */
-    public BeanKeyRef getTask() {
-        return task;
-    }
-
-    /**
-     * Gets the output type.
-     *
-     * @return the output type
-     */
-    public String getOutputType() {
-        return outputType;
-    }
-
-    /**
-     * Gets the output name.
-     *
-     * @return the output name
-     */
-    public String getOutputName() {
-        return outputName;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        return "StateTaskRef [task=" + task + ", outputType=" + outputType + ", outputName=" + outputName + "]";
-    }
-
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTask.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTask.java
deleted file mode 100644
index 6c023e89f..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTask.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import java.util.Arrays;
-import java.util.Map;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The Task Bean.
- */
-@XmlType
-public class BeanTask extends BeanBase {
-    private String name = null;
-    private String version = null;
-    private String uuid = null;
-    private String description = null;
-    private BeanLogic taskLogic = null;
-    private Map<String, BeanField> inputFields = null;
-    private Map<String, BeanField> outputFields = null;
-    private Map<String, BeanTaskParameter> parameters = null;
-    private BeanKeyRef[] contexts = null;
-
-    /**
-     * Gets the name.
-     *
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Gets the version.
-     *
-     * @return the version
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * Gets the uuid.
-     *
-     * @return the uuid
-     */
-    public String getUuid() {
-        return uuid;
-    }
-
-    /**
-     * Gets the description.
-     *
-     * @return the description
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Gets the task logic.
-     *
-     * @return the task logic
-     */
-    public BeanLogic getTaskLogic() {
-        return taskLogic;
-    }
-
-    /**
-     * Gets the input fields.
-     *
-     * @return the input fields
-     */
-    public Map<String, BeanField> getInputFields() {
-        return inputFields;
-    }
-
-    /**
-     * Gets the output fields.
-     *
-     * @return the output fields
-     */
-    public Map<String, BeanField> getOutputFields() {
-        return outputFields;
-    }
-
-    /**
-     * Gets the parameters.
-     *
-     * @return the parameters
-     */
-    public Map<String, BeanTaskParameter> getParameters() {
-        return parameters;
-    }
-
-    /**
-     * Gets the contexts.
-     *
-     * @return the contexts
-     */
-    public BeanKeyRef[] getContexts() {
-        return contexts;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        return "BeanTask [name=" + name + ", version=" + version + ", uuid=" + uuid + ", description=" + description
-                + ", taskLogic=" + taskLogic + ", inputFields=" + inputFields + ", outputFields=" + outputFields
-                + ", parameters=" + parameters + ", contexts=" + Arrays.toString(contexts) + "]";
-    }
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTaskParameter.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTaskParameter.java
deleted file mode 100644
index 8cedbb89d..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeanTaskParameter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The Task Parameter Bean.
- */
-@XmlType
-public class BeanTaskParameter extends BeanBase {
-
-    private String parameterName = null;
-    private String defaultValue = null;
-
-    /**
-     * Gets the parameter name.
-     *
-     * @return the parameter name
-     */
-    public String getParameterName() {
-        return parameterName;
-    }
-
-    /**
-     * Gets the default value.
-     *
-     * @return the default value
-     */
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public String toString() {
-        return "TaskParameter [parameterName=" + parameterName + ", defaultValue=" + defaultValue + "]";
-    }
-
-}
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/package-info.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/package-info.java
deleted file mode 100644
index 9107f6af9..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/handling/bean/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Contains JSON/XML serializable beans for use with the REST interface.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
diff --git a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/package-info.java b/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/package-info.java
deleted file mode 100644
index 503e0bd52..000000000
--- a/client/client-editor/src/main/java/org/onap/policy/apex/client/editor/rest/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Implements the RESTful editor for Apex. It implements a RESTful service towards the
- * {@link org.onap.policy.apex.model.modelapi.ApexEditorApi} Java interface for use by clients over
- * REST. It also provides a web-based client written in Javascript.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-
-package org.onap.policy.apex.client.editor.rest;
diff --git a/client/client-editor/src/main/resources/templates/PeriodicEventTemplate.json b/client/client-editor/src/main/resources/templates/PeriodicEventTemplate.json
deleted file mode 100644
index a2656515c..000000000
--- a/client/client-editor/src/main/resources/templates/PeriodicEventTemplate.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "name": "PeriodicEvent",
-    "version": "0.0.1",
-    "uuid": "40f28ab0-bc27-11e8-a355-529269fb1459",
-    "description": "Default Periodic Event",
-    "source": "System",
-    "target": "Apex",
-    "nameSpace": "org.onap.policy.apex.domains.aadm.events",
-    "parameters": {
-    }
-}
diff --git a/client/client-editor/src/main/resources/webapp/WEB-INF/web.xml b/client/client-editor/src/main/resources/webapp/WEB-INF/web.xml
deleted file mode 100644
index 36a93f2f2..000000000
--- a/client/client-editor/src/main/resources/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2016-2018 Ericsson. All rights reserved.
-  ================================================================================
-  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.
-  
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<!-- This web.xml file is not required when using Servlet 3.0 container,
-     see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html -->
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
-    <servlet>
-        <servlet-name>apex-services.rest</servlet-name>
-        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
-        <init-param>
-            <param-name>jersey.config.server.provider.packages</param-name>
-            <param-value>org.onap.policy.apex.client.editor.rest</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>apex-services.rest</servlet-name>
-        <url-pattern>/apexservices/*</url-pattern>
-    </servlet-mapping>
-
-</web-app>
diff --git a/client/client-editor/src/main/resources/webapp/close.html b/client/client-editor/src/main/resources/webapp/close.html
deleted file mode 100644
index fb246fa87..000000000
--- a/client/client-editor/src/main/resources/webapp/close.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2016-2018 Ericsson. All rights reserved.
-  ================================================================================
-  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.
-  
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<html>
-<head>
-<meta charset="utf-8" />
-<title>Apex Editor</title>
-<link rel="stylesheet" type="text/css" href="css/close.css" />
-<link rel="stylesheet" type="text/css" href="css/interfaceAssets.css">
-</head>
-<body>
-    <div class="ebSystemBar">
-        <div class="ebSystemBar-topMenuName">Apex Policy Editor</div>
-    </div>
-
-    <div class="placeholder">
-        <img class="onapLogo placeholderLogo" src="images/logo_onap.png"
-            alt="ONAP"> <img class="apexLogo placeholderLogo"
-            src="images/Apex.png" alt="Apex">
-        <p>Thanks for using the Apex editor :-)
-        <p>
-            For more information, see <a href="we need apex document link here">the
-                Apex confluence page.</a>
-    </div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/css/close.css b/client/client-editor/src/main/resources/webapp/css/close.css
deleted file mode 100644
index 0e126bd6d..000000000
--- a/client/client-editor/src/main/resources/webapp/css/close.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-html, body {
-    height: 100%;
-}
-
-.placeholder {
-    text-align: center;
-    position: relative;
-    top: 50%;
-    margin: -200px auto;
-    white-space: nowrap;
-}
-
-.placeholderLogo {
-    z-index: -1;
-    position: relative;
-}
-
-.onapLogo {
-    padding-right: 100px;
-    height: 300px;
-    width: 400px;
-}
-
-.apexLogo {
-    height: 300px;
-    width: 400px;
-}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/css/contextMenu.css b/client/client-editor/src/main/resources/webapp/css/contextMenu.css
deleted file mode 100644
index d56ea425d..000000000
--- a/client/client-editor/src/main/resources/webapp/css/contextMenu.css
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-.contextmenu_hide {
-    display: none;
-}
-
-.contextmenu_show {
-    font-family: Helvetica, Arial, sans-serif;
-    font-weight: 300;
-    list-style: none;
-    padding: 0 0 0 5px;
-    margin: 0;
-    background: rgba(255,255,255,.85);
-    -webkit-user-select: none;  
-    -moz-user-select: none;    
-    -ms-user-select: none;      
-    user-select: none;
-    color: 000;
-    box-shadow: 0 8px 16px rgba(0, 0, 0, 0.25);
-    z-index:1000;
-    position: absolute;
-    white-space: nowrap;
-    float: left;
-    width: auto;
-}
-
-.contextmenu_show  ul {
-    padding: 0;
-    margin: 0;
-    list-style: none;
-    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.176);
-    background: #f5f5f5;
-    border: 1px solid #ccc;
-    border-radius: 0 0 5px 5px;
-    color: #000;
-    font-weight: 300;
-}
-
-.contextmenu_show > li {
-    display: inline-block;
-    padding: 3px 5px;
-    margin: 0;
-}
-
-.contextmenu_show  > li.selected {
-    background: #007bff;
-    color: #fff;
-    font-weight: 400;
-}
-
-.contextmenu_show li {
-    cursor: default;
-    transition: all .1s;
-    -webkit-user-select: none;  
-    -moz-user-select: none;    
-    -ms-user-select: none;      
-    user-select: none;
-}
-
-.contextmenu_show ul li {
-    line-height: 1.5em;
-    padding: 0 5px;
-}
-
-.contextmenu_show ul li.disabled {
-    color: #999;
-    pointer-events: none;
-}
-
-.contextmenu_show ul li:hover {
-    background: #007bff;
-    color: #fff;
-    font-weight: 400;
-}
-
-.contextmenu_show ul li ul {
-    border-radius: 5px;
-    position: absolute;
-    margin-top: -70px;
-}
-
-.contextmenu_show ul li type{
-    line-height: 1.5em;
-    padding: 0 5px;
-    font-family: monospace;
-}
-
-.contextmenu_show ul li value{
-    line-height: 1.5em;
-    padding: 0 5px;
-    font-family: monospace;
-}
diff --git a/client/client-editor/src/main/resources/webapp/css/dropdownList.css b/client/client-editor/src/main/resources/webapp/css/dropdownList.css
deleted file mode 100644
index 386969ce6..000000000
--- a/client/client-editor/src/main/resources/webapp/css/dropdownList.css
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-.dropdownList_display {
-    display: inline-block;
-    vertical-align: middle;
-    text-align: left;
-    font-size: 1.2rem;
-    height: 2.4rem;
-    padding: 2px 7px;
-    border: 1px solid #b3b3b3;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    border-radius: 3px;
-    box-shadow: inset 1px 1px 0 0 #cccccc;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    -ms-appearance: none;
-    appearance: none;
-    font-family: Arial,Helvetica,sans-serif;
-    font-size: 1em;
-    border-width: 1px 0 1px 1px;
-    border-radius: 3px 0 0 3px;
-    cursor: pointer;
-    overflow: hidden;
-}
-
-.dropdownList_display_disabled {
-    display: inline-block;
-    vertical-align: middle;
-    text-align: left;
-    font-size: 1.2rem;
-    height: 2.4rem;
-    padding: 0.4rem 0.6rem;
-    border: 1px solid #b3b3b3;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    border-radius: 3px;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    -ms-appearance: none;
-    appearance: none;
-    font-family: Arial,Helvetica,sans-serif;
-    font-size: 1em;
-    border-width: 1px 0 1px 1px;
-    border-radius: 3px 0 0 3px;
-    color: #B2B2B2;
-    border-color: #B2B2B2;
-    background-color: rgba(0, 0, 0, 0.05);
-    -webkit-text-fill-color: #b2b2b2;
-    opacity: 1;
-    -ms-touch-action: none !important;
-    touch-action: none !important;
-    box-shadow: inset 1px 1px 0 0 #cccccc;
-    overflow: hidden;
-}
-
-.dropdownList_display_clicked, .dropdownList_display:hover, .dropdownList_display:focus {
-    //background: #007bff;
-}
-
-.dropdownList_display_disabled :hover, .dropdownList_display_disabled :focus {
-}
-
-.dropdownList {
-    position: relative;
-    display: inline-block;
-}
-
-.dropdownList_options {
-    display: none;
-    position: absolute;
-    z-index: 1500;
-    padding: 0 0 4px 0;
-    margin: 0;
-    color: #333;
-    list-style: none;
-    background-color: #fff;
-    border: #bfbfbf solid 1px;
-    box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.2);
-    border-radius: 3px;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    box-shadow: 5px 5px 5px #87888A;
-}
-
-.dropdownList_options ul li {
-    padding: 0px;
-    margin: 0;
-    text-decoration: none;
-    display: block;
-}
-
-.dropdownList_options ul li.selected {
-    background: #007bff;
-    color: #fff;
-    font-weight: 400;
-}
-
-.dropdownList_options ul li.disabled {
-    color: #999;
-    pointer-events: none;
-}
-
-.dropdownList_options_body {
-    margin-left: -40px;
-}
-
-.dropdownList ul li:hover {
-    background: #007bff;
-    color: #fff;
-    font-weight: 400;
-    cursor: pointer;
-}
-
-.dropdownList_show {display:block;}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/css/fileMenu.css b/client/client-editor/src/main/resources/webapp/css/fileMenu.css
deleted file mode 100644
index 8f1102e39..000000000
--- a/client/client-editor/src/main/resources/webapp/css/fileMenu.css
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-.fileMenu {
-    font-family: Helvetica, Arial, sans-serif;
-    font-weight: 300;
-    list-style: none;
-    padding: 0 0 0 5px;
-    margin: 0;
-    -webkit-user-select: none;  
-    -moz-user-select: none;    
-    -ms-user-select: none;      
-    user-select: none;
-    color: 000;
-}
-
-.fileMenu ul {
-    display: none;
-    position: absolute;
-    z-index:9999;
-    padding: 0;
-    margin: 0;
-    list-style: none;
-    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.176);
-    min-width: 250px;
-    background: #f5f5f5;
-    border: 1px solid #ccc;
-    border-radius: 0 0 5px 5px;
-    color: #000;
-    font-weight: 300;
-    text-align: left;
-}
-
-.fileMenu > li {
-    display: inline-block;
-    padding: 3px 5px;
-    margin: 0;
-}
-
-.fileMenu > li.selected {
-    background: #007bff;
-    color: #fff;
-    font-weight: 400;
-}
-
-.fileMenu li {
-    cursor: default;
-    transition: all .1s;
-    -webkit-user-select: none;  
-    -moz-user-select: none;    
-    -ms-user-select: none;      
-    user-select: none;
-}
-
-.fileMenu li.divider {
-    margin: 3px 0;
-    height: 1px;
-    background: #b3b3b3;
-    pointer-events: none;
-}
-
-.fileMenu li i {
-    font-size: .8em;
-    text-align: center;
-    color: #444;
-    transition: all .1s;
-    
-}
-
-.fileMenu li i:before {
-    position: relative;
-    top: -.1em;
-}
-
-.fileMenu > li.selected > i,
-.fileMenu ul li:hover > i {
-    color: #ebebeb;
-}
-
-.fileMenu ul li {
-    line-height: 1.5em;
-    padding: 0 5px;
-}
-
-.fileMenu ul li.toggle.active i:before {
-    content: '\f00c';
-}
-
-.fileMenu ul li.disabled {
-    color: #999;
-    pointer-events: none;
-}
-
-.fileMenu ul li.disabled i {
-    color: #aaa;
-}
-
-.fileMenu ul li.sub:after {
-    font: normal normal normal;
-    content: '\f0da';
-    float: right;
-    color: #999;
-    font-size: inherit;
-    text-rendering: auto;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-    transform: translate(0, 0);
-    line-height: inherit;
-    transition: all .1s;
-}
-
-.fileMenu ul li.sub:hover:after {
-    color: #fff;
-}
-
-.fileMenu ul li:hover {
-    background: #007bff;
-    color: #fff;
-    font-weight: 400;
-}
-
-.fileMenu ul li:last-child {
-    border-radius: 0 0 5px 5px;
-}
-
-.fileMenu ul li:hover ul {
-    display: block;
-}
-
-.fileMenu ul li kbd {
-    float: right;
-    font-weight: 300;
-    font-family: inherit;
-    color: #999;
-}
-
-.fileMenu ul li ul {
-    border-radius: 5px;
-    position: absolute;
-    margin-top: -70px;
-}
-
-.fileMenu ul li ul li:first-child {
-    border-radius: 5px 5px 0 0;
-}
-
-.fileMenuButton {
-    display: inline-block;
-    vertical-align: middle;
-    color: #333;
-    background-color: #fff;
-    border: none;
-    min-width: 60px;
-    box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2);
-    border-radius: 3px;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    background-image: linear-gradient(180deg, rgba(0,0,0,0) 0, rgba(0,0,0,0.1) 100%);
-    padding: 0 8px;
-    height: 2.4rem;
-    text-decoration: none;
-    text-align: center;
-    cursor: pointer;
-    line-height: 18px;
-}
-
-.fileMenuSeperator {
-    display: inline-block;
-    white-space: nowrap;
-    vertical-align: middle;
-    width: 1px;
-    height: 24px;
-    background-color: #CCC;
-    margin: 0 6px;
-    font-size: 2.4rem;
-    margin: 0px 10px;
-}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/css/interfaceAssets.css b/client/client-editor/src/main/resources/webapp/css/interfaceAssets.css
deleted file mode 100644
index d1fc6747e..000000000
--- a/client/client-editor/src/main/resources/webapp/css/interfaceAssets.css
+++ /dev/null
@@ -1,2807 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@charset "utf-8";
-html {
-  position: relative;
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 10px !important;
-  line-height: 10px !important;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  height: 100%;
-}
-body {
-  font-size: 1.6rem;
-  line-height: 1.2rem;
-  color: #333333;
-  background-color: #ffffff;
-  margin: 0;
-  padding: 0;
-}
-*:focus,
-.ebInput:focus,
-.ebIcon:focus,
-.ebCheckbox:focus + .ebCheckbox-inputStatus:after,
-.ebRadioBtn:focus + .ebRadioBtn-inputStatus:after,
-textarea:focus,
-button:focus,
-i:focus {
-  /**
-     * FF outline do not looks same as Chrome so adding box shadow
-     * FF outline is not working as expected
-     **/
-  /*
-     * one way of outline
-    outline: #4d90fe auto 5px;
-    box-shadow: 0 0 0 1px #4d90fe;
-    -webkit-box-shadow: none;
-    */
-  outline: none;
-  //box-shadow: 0 0 2px 1px #FFFFFF;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  color: #4d4d4d;
-  font-weight: bold;
-}
-h1 {
-  line-height: 3.2rem;
-  font-size: 3.2rem;
-  font-weight: normal;
-  padding: 0.6rem 0;
-  margin: 0 0 0.6rem 0;
-}
-h2 {
-  border-bottom: #000000 solid 1px;
-  line-height: 2.0rem;
-  font-size: 2.0rem;
-  font-weight: normal;
-  padding: 1.2rem 0 0.7rem 0;
-  margin: 0 0 0.4rem 0;
-}
-h3 {
-  border-bottom: #7f7f7f solid 1px;
-  line-height: 1.6rem;
-  font-size: 1.6rem;
-  padding: 1.2rem 0 0.7rem 0;
-  margin: 0 0 0.4rem 0;
-  font-weight: normal;
-  color: #333333;
-}
-h4 {
-  border-bottom: #b2b2b2 solid 1px;
-  line-height: 1.2rem;
-  font-size: 1.2rem;
-  padding: 0.6rem 0;
-  margin: 0 0 0.6rem 0;
-  font-weight: bold;
-  color: #333333;
-}
-.ebLayout-SectionSubheading h3 {
-  float: left;
-  margin: 0;
-  border-bottom: none;
-}
-
-/* System Bar */
-.ebSystemBar {
-  position: relative;
-  width: 100%;
-  height: 40px;
-  border-top: 4px solid #0066b3;
-  background-image: linear-gradient(180deg, #ffffff 0%, #f4f4f4 100%);
-  box-shadow: 0 1px 2px #D2D2D2;
-}
-.ebSystemBar::before {
-  position: absolute;
-  top: -4px;
-  left: 0;
-  width: 100%;
-  height: 4px;
-  content: "";
-  font-size: 0;
-  background: #0066b3;
-  background: -o-linear-gradient(left, #a2c517 10%, #009046 30%, #0082b6 50%, #151f77 75%, #db0050 100%);
-  background: -moz-linear-gradient(left, #a2c517 10%, #009046 30%, #0082b6 50%, #151f77 75%, #db0050 100%);
-  background: -webkit-linear-gradient(left, #a2c517 10%, #009046 30%, #0082b6 50%, #151f77 75%, #db0050 100%);
-  background: -ms-linear-gradient(left, #a2c517 10%, #009046 30%, #0082b6 50%, #151f77 75%, #db0050 100%);
-  background: -webkit-gradient(linear, left top, right top, color-stop(0.1, #a2c517), color-stop(0.3, #009046), color-stop(0.5, #0082b6), color-stop(0.75, #151f77), color-stop(1, #db0050));
-  background: linear-gradient(left, #a2c517 10%, #009046 30%, #0082b6 50%, #151f77 75%, #db0050 100%);
-}
-.ebSystemBar-logo {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  height: 40px;
-  width: 20px;
-  padding: 0 10px;
-  background: url('../resources/systemBar/econ01.svg') no-repeat center center transparent;
-  background-size: 20px;
-}
-.ebSystemBar-topMenuName {
-  display: inline-block;
-  padding: 0 5px 0 40px;
-  margin: 0;
-  line-height: 40px;
-  font-size: 16.8px;
-  color: #58585A;
-}
-.ebSystemBar-topMenu {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 50px;
-  list-style: none;
-  height: 40px;
-  margin: 0;
-  padding: 0;
-}
-.ebSystemBar-topMenu li {
-  display: inline-block;
-}
-.ebSystemBar-topMenu a {
-  padding: 0 5px 0 15px;
-  margin: 0;
-  font-size: 1.6em;
-  line-height: 40px;
-  color: #58585a;
-  cursor: pointer;
-  text-decoration: none;
-}
-.ebSystemBar-topMenu a:hover {
-  color: #0066B3;
-}
-.ebSystemBar-rightButton {
-  float: right;
-  display: inline-block;
-  line-height: 40px;
-  vertical-align: middle;
-}
-.ebSystemBar-rightButton a {
-  display: block;
-  padding: 0 18px 0 18px;
-  font-size: 1.3rem;
-  color: #0066B3;
-  background-color: transparent;
-  background-repeat: no-repeat;
-  background-position: 18px center;
-  border-left: solid 1px #D2D2D2;
-}
-.ebSystemBar-rightButton a:hover {
-  text-decoration: underline;
-}
-.ebSystemBar-rightButton:hover {
-  background-image: linear-gradient(180deg, #f2f2f2 0%, #e8e8e8 100%);
-}
-@media screen and (max-width: 640px) {
-  .ebSystemBar-topBar-rightButton a {
-    width: 0;
-    padding-left: 34px;
-    text-indent: -9999px;
-  }
-}
-
-/* Inline Message */
-.ebInlineMessage {
-   padding: 5px 15px 0px 7px;
-   font-size: 0;
-   position: fixed;
-   bottom: 0;
-   left: 2;
-   width: calc(100% - 30px);
-   height: 66px;
-   border: 3px solid #adadad;
-   background-color: #FFFFFF;
-}
-.ebInlineMessage-iconHolder,
-.ebInlineMessage-contentHolder {
-  display: inline-block;
-  vertical-align: top;
-}
-.ebInlineMessage-iconHolder {
-  width: 20px;
-  margin: 0 12px 0 0;
-}
-.ebInlineMessage-contentHolder {
-  width: calc(100% - 32px);
-  font-size: 1.2rem;
-}
-.ebInlineMessage-header {
-  margin-top: 3px;
-  font-size: 14px;
-  line-height: 14px;
-}
-.ebInlineMessage-separator {
-  height: 1px;
-  margin: 12px 0;
-  background-color: #adadad;
-  opacity: 0.3;
-}
-.ebInlineMessage-description {
-  color: #666666;
-  white-space: pre;
-}
-
-/* Table */
-.ebTable {
-  margin: 0;
-  padding: 0;
-  table-layout: fixed;
-  border-left: 1px solid #cccccc; // ewatkmi: added for visible border;
-  border-right: 1px solid #cccccc; // ewatkmi: added for visible border;
-  border-bottom: 1px solid #cccccc; // ewatkmi: added for visible border;
-  border-collapse: collapse;
-  border-spacing: 0;
-  color: #1a1a1a;
-}
-.ebTable_fullW {
-  width: 100%;
-}
-.ebTable-th_resizable,
-.ebTable-th_sortable {
-  position: relative;
-}
-.ebTable-th_resizable .ebTable-headerResize {
-  position: absolute;
-  top: -20px;
-  bottom: -20px;
-  right: -12px;
-  width: 10px;
-  cursor: col-resize;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -o-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-}
-.ebTable-th_sortable {
-  cursor: pointer !important;
-}
-.ebTable-th_sortable .ebTable-header {
-  display: flex;
-  flex-wrap: nowrap;
-  flex-direction: row;
-  align-items: center;
-}
-.ebTable-th_sortable .ebTable-headerText {
-  flex-shrink: 1;
-  flex-grow: 0;
-  margin-right: 8px;
-  box-sizing: border-box;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -o-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-}
-.ebTable-th_sortable .ebTable-headerSort {
-  flex-grow: 0;
-  flex-shrink: 0;
-  flex-basis: 10px;
-  margin-left: 4px;
-}
-.ebTable-th_sortable .ebTable-headerSortOrder {
-  flex-grow: 1;
-  color: #999999;
-  font-weight: normal;
-}
-.ebTable-header {
-  position: relative;
-  display: block;
-  width: 100%;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.ebTable-headerText {
-  padding: 4px 0;
-  display: inline-block;
-  vertical-align: middle;
-  width: 100%;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.ebTable thead tr {
-  height: 3.2rem;
-  font-size: 1.2rem;
-  font-weight: bold;
-  text-align: left;
-}
-.ebTable thead tr th {
-  padding-left: 1.2rem;
-  padding-right: 1.2rem;
-  text-align: left;
-  cursor: default;
-  border-top: #cccccc solid 1px;
-  border-bottom: #cccccc solid 1px;
-  border-right: #e6e6e6 solid 1px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.ebTable thead tr th:last-child {
-  border-right: none;
-}
-.ebTable thead tr:hover {
-  background: none;
-}
-.ebTable thead tr:active {
-  background: none;
-}
-.ebTable tbody tr {
-  height: 3.2rem;
-  font-size: 1.2rem;
-  border-bottom: #e6e6e6 solid 1px;
-}
-.ebTable tbody tr td {
-  margin: 0;
-  padding: 0 1.2rem;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  cursor: default;
-  border-right: #e6e6e6 solid 1px;
-}
-.ebTable tbody tr td:last-child {
-  border-right: none;
-}
-.ebTable_striped tbody tr {
-  border-bottom: none;
-}
-.ebTable_striped tbody tr td {
-  border-right: none;
-}
-.ebTable_striped tbody tr:nth-of-type(even) {
-  background-color: #f2f2f2;
-}
-.ebTable_striped tbody tr:nth-of-type(odd) { // ewatkmi: added for nested tables;
-  background-color: #ffffff;
-}
-.ebTable_compact tbody tr {
-  height: 2.6rem;
-}
-.ebTable_expandableStriped {
-  border-collapse: separate;
-}
-.ebTable_expandableStriped tbody tr {
-  border-bottom: none;
-}
-.ebTable_expandableStriped tbody tr td {
-  border-right: none;
-}
-.ebTable_expandableStriped tbody tr:nth-of-type(4n-1),
-.ebTable_expandableStriped tbody tr:nth-of-type(4n) {
-  background-color: #f2f2f2;
-}
-.ebTable_pinstripe tr td {
-  border-bottom: #e6e6e6 solid 1px;
-}
-.ebTable_color_paleBlue.ebTable thead tr th {
-  background-color: #99ddee;
-  border-top: none;
-  border-bottom: none;
-}
-.ebTable_color_paleBlue.ebTable_striped tbody tr:nth-of-type(even) {
-  background-color: #e6f6fb;
-}
-.ebTable_color_purple.ebTable thead tr th {
-  background-color: #ca9bc1;
-  border-top: none;
-  border-bottom: none;
-}
-.ebTable_color_purple.ebTable_striped tbody tr:nth-of-type(even) {
-  background-color: #f2e6ef;
-}
-.ebTable_color_darkGreen.ebTable thead tr th {
-  background-color: #99c0bf;
-  border-top: none;
-  border-bottom: none;
-}
-.ebTable_color_darkGreen.ebTable_striped tbody tr:nth-of-type(even) {
-  background-color: #e6efef;
-}
-.ebTable_color_green.ebTable thead tr th {
-  background-color: #d0e3a2;
-  border-top: none;
-  border-bottom: none;
-}
-.ebTable_color_green.ebTable_striped tbody tr:nth-of-type(even) {
-  background-color: #f3f8e8;
-}
-.ebTable_color_yellow.ebTable thead tr th {
-  background-color: #fde499;
-  border-top: none;
-  border-bottom: none;
-}
-.ebTable_color_yellow.ebTable_striped tbody tr:nth-of-type(even) {
-  background-color: #fff8e6;
-}
-.ebTable_color_orange.ebTable thead tr th {
-  background-color: #f9d099;
-  border-top: none;
-  border-bottom: none;
-}
-.ebTable_color_orange.ebTable_striped tbody tr:nth-of-type(even) {
-  background-color: #fef3e6;
-}
-.ebTable_color_red.ebTable thead tr th {
-  background-color: #f4a6a3;
-  border-top: none;
-  border-bottom: none;
-}
-.ebTable_color_red.ebTable_striped tbody tr:nth-of-type(even) {
-  background-color: #fce9e8;
-}
-.ebTable_borderTop_none thead tr th {
-  border-top: none;
-}
-.ebTable_verticalBorders_none thead tr th,
-.ebTable_verticalBorders_none tr td {
-  border-right: none !important;
-  border-left: none !important;
-}
-.ebTable_wrapHeaders th {
-  white-space: normal !important;
-  text-overflow: inherit !important;
-}
-.ebTable_wrapHeaders th .ebTable-headerText {
-  white-space: normal !important;
-  text-overflow: inherit !important;
-}
-.ebTable-expandableRow {
-  height: inherit !important;
-  display: none;
-}
-.ebTable-expandableRow_expanded {
-  display: table-row;
-}
-.ebTable-expandableRow > td {
-  padding: 0 !important;
-}
-.ebTable-expandableRow > td > div {
-  overflow: hidden;
-  height: 0;
-  transition: height 0.3s ease-in-out;
-}
-/**
- * Hover/Active/Selected Effects
- *
- * Modifiers:
- *    .ebTable_hoverActive_none (disables native hover and active selectors, primarily for pin columns plugin)
- */
-.ebTable {
-  /** Hover effect **/
-}
-.ebTable.ebTable:not(.ebTable_hoverActive_none) tbody tr:not(.ebTable-expandableRow):not(.headerRow):hover > *,
-.ebTable tbody tr:not(.ebTable-expandableRow):not(.headerRow).ebTableRow_hover > * {
-  background-image: linear-gradient(0deg, rgba(0, 102, 179, 0.1), rgba(0, 102, 179, 0.1));
-}
-.ebTable.ebTable_highlightedEffect_solid tbody tr:not(.ebTable-expandableRow).ebTableRow_highlighted > * {
-  background-color: #ffffff !important;
-}
-
-/* Context Menu */
-.ebContextMenu {
-  position: relative;
-  width: 16px;
-  height: 16px;
-}
-.ebContextMenu:focus {
-  outline: none;
-}
-.ebContextMenu-ExpandBtn,
-.ebContextMenu-expandBtn {
-  width: 16px;
-  height: 16px;
-  position: relative;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -o-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-}
-.ebContextMenu-ExpandBtn:focus,
-.ebContextMenu-expandBtn:focus {
-  outline: none;
-}
-.ebContextMenu-Dropdown,
-.ebContextMenu-body {
-  position: absolute;
-  z-index: 1500;
-  min-width: 60px;
-  width: auto;
-  height: auto;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -o-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-  box-shadow: 5px 5px 5px #87888A;
-}
-.ebContextMenu-Dropdown_corner_default,
-.ebContextMenu-body_corner_default {
-  position: absolute;
-  top: 20px;
-  left: 0px;
-}
-.ebContextMenu-Dropdown_corner_topRight,
-.ebContextMenu-body_corner_topRight {
-  position: absolute;
-  top: 20px;
-  right: 0px;
-}
-.ebContextMenu-Dropdown_corner_bottomLeft,
-.ebContextMenu-body_corner_bottomLeft {
-  position: absolute;
-  bottom: 20px;
-  left: 0px;
-}
-.ebContextMenu-Dropdown_corner_bottomRight,
-.ebContextMenu-body_corner_bottomRight {
-  position: absolute;
-  bottom: 20px;
-  right: 0px;
-}
-.ebContextMenu-Dropdown_visible_false,
-.ebContextMenu-body_visible_false {
-  visibility: hidden;
-}
-.ebContextMenu-Dropdown_visible_true,
-.ebContextMenu-body_visible_true {
-  display: block;
-}
-
-/* Component List */
-.ebComponentList {
-  position: relative;
-  z-index: 1500;
-  padding: 4px 0;
-  margin: 0;
-  color: #333333;
-  list-style: none;
-  background-color: #ffffff;
-  border: #bfbfbf solid 1px;
-  box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.2);
-  border-radius: 3px;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.ebComponentList-group,
-.ebComponentList-item {
-  padding: 0 0.8rem;
-  line-height: 2.4rem;
-  font-size: 1.2rem;
-  background-color: #ffffff;
-}
-.ebComponentList-iconHolder {
-  display: inline-block;
-  vertical-align: middle;
-  width: 16px;
-  padding-right: 8px;
-}
-.ebComponentList-item {
-  cursor: pointer;
-}
-.ebComponentList-item-name {
-  display: inline-block;
-  font-size: 12px;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  width: calc(100% - 24px);
-  vertical-align: middle;
-}
-.ebComponentList-item_icon {
-  font-size: 0;
-}
-.ebComponentList-link,
-.ebComponentList-item,
-.ebComponentList-item > *,
-.ebComponentList-group-header {
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-.ebComponentList-group {
-  display: block;
-}
-.ebComponentList-group_expandable_collapsed > .ebComponentList-group-header,
-.ebComponentList-group_expandable_expanded > .ebComponentList-group-header {
-  font-size: 0;
-  cursor: pointer;
-  white-space: nowrap;
-  height: 24px;
-  vertical-align: middle;
-}
-.ebComponentList-group_expandable_collapsed > .ebComponentList-group-header .ebComponentList-iconHolder + .ebComponentList-group-name,
-.ebComponentList-group_expandable_expanded > .ebComponentList-group-header .ebComponentList-iconHolder + .ebComponentList-group-name {
-  width: calc(100% - 40px);
-}
-.ebComponentList-group_expandable_collapsed > .ebComponentList-inner,
-.ebComponentList-group_expandable_expanded > .ebComponentList-inner {
-  padding: 0 0 0 24px;
-  margin: 0 -0.8rem;
-}
-.ebComponentList-group_expandable_collapsed > .ebComponentList-group-header {
-  border: none;
-}
-.ebComponentList-group_expandable_collapsed > .ebComponentList-inner .ebComponentList-item {
-  overflow: hidden;
-  padding: 0;
-  margin: 0;
-  height: 0;
-  opacity: 0;
-  transition: height 0.2s linear, padding 0.075s 0.075s linear, margin 0.075s 0.075s linear, opacity 0.075s linear;
-}
-.ebComponentList-group_expandable_collapsed > .ebComponentList-inner .ebComponentList-group_expandable_collapsed .ebComponentList-group-header,
-.ebComponentList-group_expandable_collapsed > .ebComponentList-inner .ebComponentList-group_expandable_expanded .ebComponentList-group-header {
-  overflow: hidden;
-  padding: 0;
-  margin: 0;
-  height: 0;
-  opacity: 0;
-  transition: height 0.2s linear, padding 0.075s 0.075s linear, margin 0.075s 0.075s linear, opacity 0.075s linear;
-}
-.ebComponentList-group_expandable_collapsed > .ebComponentList-inner .ebComponentList-group > .ebComponentList-inner {
-  padding: 0;
-  margin: 0;
-  transition: padding 0.1s 0.1s linear, margin 0.1s 0.1s linear;
-}
-.ebComponentList-group_expandable_expanded > .ebComponentList-group-header {
-  border-bottom: 1px solid #999;
-}
-.ebComponentList-group_expandable_expanded > .ebComponentList-inner > .ebComponentList-item {
-  overflow: hidden;
-  height: 24px;
-  transition: height 0.2s linear, padding 0.075s linear, margin 0.075s linear, opacity 0.15s 0.15s linear;
-}
-.ebComponentList-group_expandable_expanded > .ebComponentList-inner > .ebComponentList-group_expandable_expanded > .ebComponentList-group-header,
-.ebComponentList-group_expandable_expanded > .ebComponentList-inner > .ebComponentList-group_expandable_collapsed > .ebComponentList-group-header {
-  overflow: hidden;
-  height: 24px;
-  text-overflow: ellipsis;
-  transition: height 0.2s linear, padding 0.075s linear, margin 0.075s linear, opacity 0.15s 0.15s linear;
-}
-.ebComponentList-group:not(.ebComponentList-group_expandable_collapsed):not(.ebComponentList-group_expandable_expanded) > .ebComponentList-group-header {
-  cursor: default !important;
-  pointer-events: none !important;
-  -ms-touch-action: none !important;
-  touch-action: none !important;
-  -khtml-user-select: none !important;
-  -moz-user-select: none !important;
-  -o-user-select: none !important;
-  -webkit-user-select: none !important;
-  user-select: none;
-}
-.ebComponentList-group-header {
-  font-size: 1.2rem;
-  font-weight: bold;
-  line-height: 2.4rem;
-  border-bottom: 1px solid #999;
-  background-color: #ffffff;
-}
-.ebComponentList-group-header_icon {
-  font-size: 0;
-}
-.ebComponentList-group-header_icon > .ebComponentList-group-name {
-  width: calc(100% - 24px);
-}
-.ebComponentList-group-name {
-  display: inline-block;
-  width: calc(100% - 16px);
-  font-size: 1.2rem;
-  line-height: 2.4rem;
-  font-weight: bold;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  white-space: nowrap;
-  vertical-align: middle;
-}
-.ebComponentList-inner {
-  margin: 0 -0.8rem;
-  padding: 4px 0 0 0;
-}
-.ebComponentList-link {
-  display: block;
-}
-.ebComponentList-link:hover {
-  text-decoration: none;
-}
-.ebComponentList-separator {
-  height: 1px;
-  margin: 0.4rem;
-  background-color: #E6E6E6;
-}
-.ebComponentList_focus_forced .ebComponentList-item:hover {
-  background-color: transparent;
-}
-.ebComponentList_focus_forced .ebComponentList-item_focused:hover {
-  background-color: #e6f0f7;
-}
-.ebComponentList:not(.ebComponentList_focus_forced) .ebComponentList-item:hover {
-  background-color: #e6f0f7;
-}
-.ebComponentList_focus_forced .ebComponentList-item:active,
-.ebComponentList:not(.ebComponentList_focus_forced) .ebComponentList-item:active {
-  background-color: #cce0f0;
-}
-.ebComponentList-item {
-  /* Fixes MultiSelectBox ellipsis bug in Firefox */
-  margin: 0px !important;
-  font-size: 1em !important; 
-}
-.ebComponentList-item_focused {
-  background-color: #e6f0f7;
-}
-.ebComponentList-item_disabled {
-  color: #b0b0af;
-  cursor: not-allowed !important;
-}
-.ebComponentList-item_disabled:hover,
-.ebComponentList-item_disabled:active {
-  background-color: inherit !important;
-}
-.ebComponentList-item_selected {
-  position: relative;
-  cursor: default;
-}
-.ebComponentList-item_selected > .ebComponentList-link {
-  cursor: default;
-  color: #333333;
-  cursor: default !important;
-  pointer-events: none !important;
-  -ms-touch-action: none !important;
-  touch-action: none !important;
-  -khtml-user-select: none !important;
-  -moz-user-select: none !important;
-  -o-user-select: none !important;
-  -webkit-user-select: none !important;
-  user-select: none;
-}
-.ebComponentList-item_selected:before {
-  position: absolute;
-  content: "";
-  left: 0;
-  top: 0;
-  bottom: 0;
-  width: 100%;
-  opacity: .2;
-  background-color: #0967b2;
-}
-.ebComponentList-item > .ebComponentList-checkboxHolder > .ebCheckbox {
-  margin-left: 1px;
-}
-.ebComponentList-item > .ebComponentList-checkboxHolder > .ebCheckbox-label {
-  padding-left: 3px;
-  overflow: hidden;
-  font-size: 12px;
-  line-height: 2.4rem;
-  text-overflow: ellipsis;
-  width: calc(100% - 24px);
-}
-.ebComponentList-info {
-  color: #333333;
-  font-style: italic;
-  text-align: center;
-}
-.ebComponentList-info:hover {
-  background-color: #ffffff;
-}
-.ebComponentList-info:active {
-  background-color: #ffffff;
-}
-.ebComponentList-info,
-.ebComponentList-loader {
-  display: none;
-  margin: 0.6rem;
-  cursor: default;
-}
-.ebComponentList_info .ebComponentList-group,
-.ebComponentList_info .ebComponentList-separator,
-.ebComponentList_info .ebComponentList-item {
-  display: none;
-}
-.ebComponentList_info .ebComponentList-info {
-  display: block;
-}
-.ebComponentList_loading {
-  min-height: 34px;
-}
-.ebComponentList_loading .ebComponentList-loader {
-  display: block;
-}
-.ebComponentList_loading .ebComponentList-item_selected:before {
-  display: none;
-}
-.ebComponentList_loading > .ebComponentList-group,
-.ebComponentList_loading > .ebComponentList-item,
-.ebComponentList_loading > .ebComponentList-items > .ebComponentList-group,
-.ebComponentList_loading > .ebComponentList-items > .ebComponentList-item {
-  opacity: 0.4;
-}
-
-/* Scrollbar */
-.eb_scrollbar {
-  -webkit-overflow-scrolling: touch;
-  overflow: auto;
-}
-.eb_scrollbar::-webkit-scrollbar {
-  width: 14px;
-  height: 14px;
-}
-.eb_scrollbar::-webkit-scrollbar-track {
-  background-color: #f0f0f0;
-  background-clip: content-box;
-}
-.eb_scrollbar::-webkit-scrollbar-thumb {
-  background-color: #cccccc;
-  border-radius: 3px;
-  transition: all 0.2s linear;
-  background-clip: content-box;
-}
-.eb_scrollbar::-webkit-scrollbar-thumb:hover {
-  background-color: #999999;
-}
-.eb_scrollbar::-webkit-scrollbar-button {
-  width: 14px;
-  height: 14px;
-  background-repeat: no-repeat;
-  background-color: #f0f0f0;
-  background-position: center;
-}
-.eb_scrollbar::-webkit-scrollbar-button:hover {
-  background-color: #cccccc;
-}
-.eb_scrollbar::-webkit-scrollbar-button:vertical:decrement {
-  background-position: center 4px;
-  background-image: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' width='8px' height='5px' viewBox='0 0 8 5' enable-background='new 0 0 8 5' xml:space='preserve'><path fill='#333333' d='M0.293,3.293l3-3C3.488,0.098,3.744,0,4,0s0.512,0.098,0.707,0.293l3,3c0.391,0.391,0.391,1.023,0,1.414 s-1.023,0.391-1.414,0L4,2.414L1.707,4.707c-0.391,0.391-1.023,0.391-1.414,0S-0.098,3.684,0.293,3.293z'/></svg>");
-  border-top-left-radius: 2px;
-  border-top-right-radius: 2px;
-}
-.eb_scrollbar::-webkit-scrollbar-button:vertical:increment {
-  background-image: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' width='8px' height='5px' viewBox='0 0 8 5' enable-background='new 0 0 8 5' xml:space='preserve'><path fill='#333333' d='M7.707,1.707l-3,3C4.512,4.902,4.255,5,4,5S3.488,4.902,3.292,4.707l-3-3c-0.391-0.391-0.391-1.023,0-1.414 s1.023-0.391,1.414,0L4,2.586l2.293-2.293c0.391-0.391,1.023-0.391,1.414,0S8.098,1.316,7.707,1.707z'/></svg>");
-  border-bottom-left-radius: 2px;
-  border-bottom-right-radius: 2px;
-}
-.eb_scrollbar::-webkit-scrollbar-button:horizontal:decrement {
-  background-position: 4px center;
-  background-image: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' width='5px' height='8px' viewBox='0 0 5 8' enable-background='new 0 0 5 8' xml:space='preserve'><defs></defs><path fill='#333333' d='M4.707,6.293c0.391,0.391,0.391,1.023,0,1.414C4.512,7.902,4.256,8,4,8S3.488,7.902,3.293,7.707l-3-3 C0.105,4.52,0,4.266,0,4s0.105-0.52,0.293-0.707l3-3c0.391-0.391,1.023-0.391,1.414,0c0.391,0.39,0.391,1.023,0,1.414L2.414,4 L4.707,6.293z'/></svg>");
-  border-bottom-left-radius: 2px;
-  border-top-left-radius: 2px;
-}
-.eb_scrollbar::-webkit-scrollbar-button:horizontal:increment {
-  background-image: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' width='5px' height='8px' viewBox='0 0 5 8' enable-background='new 0 0 5 8' xml:space='preserve'><defs></defs><path fill='#333333' d='M0.293,1.707c-0.391-0.391-0.391-1.023,0-1.414C0.488,0.098,0.744,0,1,0s0.512,0.098,0.707,0.293l3,3 C4.895,3.48,5,3.734,5,4s-0.105,0.52-0.293,0.707l-3,3c-0.391,0.391-1.023,0.391-1.414,0s-0.391-1.023,0-1.414L2.586,4L0.293,1.707z'/></svg>");
-  border-bottom-right-radius: 2px;
-  border-top-right-radius: 2px;
-}
-
-
-/* Input */
-.ebInput {
-  display: inline-block;
-  vertical-align: middle;
-  text-align: left;
-  font-size: 1.2rem;
-  width: 140px;
-  height: 2.4rem;
-  padding: 0.4rem 0.6rem;
-  border: 1px solid #b3b3b3;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  border-radius: 3px;
-  box-shadow: inset 1px 1px 0 0 #cccccc;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  -ms-appearance: none;
-  appearance: none;
-}
-.ebInput_wMargin {
-  margin: 6px;
-}
-.ebInput_txtCenter {
-  text-align: center;
-}
-.ebInput_miniW,
-.ebInput_width_mini {
-  width: 40px;
-}
-.ebInput_smallW,
-.ebInput_width_small {
-  width: 80px;
-}
-.ebInput_longW,
-.ebInput_width_long {
-  width: 180px;
-}
-.ebInput_xLongW,
-.ebInput_width_xLong {
-  width: 220px;
-}
-.ebInput_width_full {
-  min-width: 40px;
-  width: 100%;
-}
-.ebInput_noRightSide {
-  border-width: 1px 0 1px 1px;
-  border-radius: 3px 0 0 3px;
-}
-.ebInput_noLeftSide {
-  border-width: 1px 1px 1px 0;
-  border-radius: 0 3px 3px 0;
-  box-shadow: inset 0 1px 0 0 #cccccc;
-}
-.ebInput:hover {
-  border-color: #666666;
-}
-.ebInput[readonly] {
-  cursor: text;
-  //box-shadow: none;
-  border-color: #E3E3E3;
-  background-color: #f0f0f0;
-  color: #b2b2b2;
-}
-.ebInput[readonly]:hover {
-  //border-color: #E3E3E3;
-}
-.ebInput_disabled,
-.ebInput:disabled {
-  color: #B2B2B2;
-  border-color: #B2B2B2;
-  background-color: rgba(0, 0, 0, 0.05);
-  -webkit-text-fill-color: #b2b2b2;
-  opacity: 1;
-  -ms-touch-action: none !important;
-  touch-action: none !important;
-  box-shadow: inset 1px 1px 0 0 #cccccc;
-}
-.ebInput_borderColor {
-  border-color: #b3b3b3;
-}
-.ebInput_borderColor_red {
-  border-color: #e32119;
-}
-.ebInput_status_none {
-  border-color: #b3b3b3;
-}
-.ebInput_status_warning {
-  border-color: #f08a00;
-}
-.ebInput_status_error {
-  border-color: #e32119;
-}
-.ebInput.eb_wMargin + .ebInput-status {
-  margin: -0.2rem 0.8rem 0 0.6rem;
-}
-.ebInput-status {
-  display: block;
-  margin: 0.4rem 0 0 0;
-  line-height: 1.2rem;
-  min-height: 1.8rem;
-  font-size: 1.2rem;
-  font-weight: normal;
-}
-.ebInput-statusOk,
-.ebInput-statusError {
-  vertical-align: middle;
-}
-.ebInput-statusOk:before,
-.ebInput-statusError:before {
-  display: inline-block;
-  vertical-align: middle;
-  margin: 0 0.6rem 0 0;
-  width: 1.2rem;
-  height: 1.2rem;
-  content: '';
-  background-repeat: no-repeat;
-}
-.ebInput-statusInfo {
-  vertical-align: middle;
-  color: #8d8d8d;
-}
-.ebInput-statusOk {
-  color: #89ba17;
-  display: none;
-}
-.ebInput-statusOk:before {
-  background-image: url('../resources/form/valid_icon.svg');
-}
-.ebInput-statusError {
-  color: #e32119;
-  display: none;
-}
-.ebInput-statusError:before {
-  background-image: url('../resources/form/invalid_icon.svg');
-}
-.ebInput-status_none {
-  display: none;
-}
-.ebInput-status_hide .ebInput-statusOk,
-.ebInput-status_hide .ebInput-statusError,
-.ebInput-status_hide .ebInput-statusInfo {
-  display: none;
-}
-.ebInput-status_info .ebInput-statusInfo {
-  display: inline-block;
-}
-.ebInput-status_info .ebInput-statusOk,
-.ebInput-status_info .ebInput-statusError {
-  display: none;
-}
-.ebInput-status_ok .ebInput-statusOk {
-  display: inline-block;
-}
-.ebInput-status_ok .ebInput-statusError,
-.ebInput-status_ok .ebInput-statusInfo {
-  display: none;
-}
-.ebInput-status_error .ebInput-statusError {
-  display: inline-block;
-}
-.ebInput-status_error .ebInput-statusOk,
-.ebInput-status_error .ebInput-statusInfo {
-  display: none;
-}
-.ebInput:not(.ebInput_validation_focusLost):valid + .ebInput-status:not(.ebInput-status_hide):not(.ebInput-status_info):not(.ebInput-status_ok):not(.ebInput-status_error) .ebInput-statusOk {
-  display: inline-block;
-}
-.ebInput:not(.ebInput_validation_focusLost):invalid:not(.ebInput_borderColor):not(.ebInput_status_warning):not(.ebInput_status_none) {
-  border-color: #e32119;
-}
-.ebInput:not(.ebInput_validation_focusLost):invalid + .ebInput-status:not(.ebInput-status_hide):not(.ebInput-status_info):not(.ebInput-status_ok):not(.ebInput-status_error) .ebInput-statusError {
-  display: inline-block;
-}
-.ebInput:not(.ebInput_validation_focusLost):invalid + .ebInput-status:not(.ebInput-status_hide):not(.ebInput-status_info):not(.ebInput-status_ok):not(.ebInput-status_error) .ebInput-statusInfo {
-  display: none;
-}
-.ebInput.ebInput_validation_focusLost:not(:focus):valid + .ebInput-status:not(.ebInput-status_hide):not(.ebInput-status_info):not(.ebInput-status_ok):not(.ebInput-status_error) .ebInput-statusOk {
-  display: inline-block;
-}
-.ebInput.ebInput_validation_focusLost:not(:focus):invalid:not(.ebInput_borderColor):not(.ebInput_status_warning):not(.ebInput_status_none) {
-  border-color: #e32119;
-}
-.ebInput.ebInput_validation_focusLost:not(:focus):invalid + .ebInput-status:not(.ebInput-status_hide):not(.ebInput-status_info):not(.ebInput-status_ok):not(.ebInput-status_error) .ebInput-statusError {
-  display: inline-block;
-}
-.ebInput.ebInput_validation_focusLost:not(:focus):invalid + .ebInput-status:not(.ebInput-status_hide):not(.ebInput-status_info):not(.ebInput-status_ok):not(.ebInput-status_error) .ebInput-statusInfo {
-  display: none;
-}
-
-/* Textarea */
-.ebTextArea {
-  -webkit-overflow-scrolling: touch;
-  overflow: auto;
-  display: inline-block;
-  vertical-align: middle;
-  text-align: left;
-  font-size: 1.2rem;
-  width: 140px;
-  padding: 0.4rem 0.6rem;
-  margin: 0;
-  border: 1px solid #b3b3b3;
-  font-family: arial;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  border-radius: 3px;
-  box-shadow: inset 1px 1px 0 0 #cccccc;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  -ms-appearance: none;
-  appearance: none;
-}
-.ebTextArea::-webkit-scrollbar {
-  width: 14px;
-  height: 14px;
-}
-.ebTextArea::-webkit-scrollbar-track {
-  background-color: #f0f0f0;
-  background-clip: content-box;
-}
-.ebTextArea::-webkit-scrollbar-thumb {
-  background-color: #cccccc;
-  border-radius: 3px;
-  transition: all 0.2s linear;
-  background-clip: content-box;
-}
-.ebTextArea::-webkit-scrollbar-thumb:hover {
-  background-color: #999999;
-}
-.ebTextArea::-webkit-scrollbar-button {
-  width: 14px;
-  height: 14px;
-  background-repeat: no-repeat;
-  background-color: #f0f0f0;
-  background-position: center;
-}
-.ebTextArea::-webkit-scrollbar-button:hover {
-  background-color: #cccccc;
-}
-.ebTextArea::-webkit-scrollbar-button:vertical:decrement {
-  background-position: center 4px;
-  background-image: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' width='8px' height='5px' viewBox='0 0 8 5' enable-background='new 0 0 8 5' xml:space='preserve'><path fill='#333333' d='M0.293,3.293l3-3C3.488,0.098,3.744,0,4,0s0.512,0.098,0.707,0.293l3,3c0.391,0.391,0.391,1.023,0,1.414 s-1.023,0.391-1.414,0L4,2.414L1.707,4.707c-0.391,0.391-1.023,0.391-1.414,0S-0.098,3.684,0.293,3.293z'/></svg>");
-  border-top-left-radius: 2px;
-  border-top-right-radius: 2px;
-}
-.ebTextArea::-webkit-scrollbar-button:vertical:increment {
-  background-image: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' width='8px' height='5px' viewBox='0 0 8 5' enable-background='new 0 0 8 5' xml:space='preserve'><path fill='#333333' d='M7.707,1.707l-3,3C4.512,4.902,4.255,5,4,5S3.488,4.902,3.292,4.707l-3-3c-0.391-0.391-0.391-1.023,0-1.414 s1.023-0.391,1.414,0L4,2.586l2.293-2.293c0.391-0.391,1.023-0.391,1.414,0S8.098,1.316,7.707,1.707z'/></svg>");
-  border-bottom-left-radius: 2px;
-  border-bottom-right-radius: 2px;
-}
-.ebTextArea::-webkit-scrollbar-button:horizontal:decrement {
-  background-position: 4px center;
-  background-image: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' width='5px' height='8px' viewBox='0 0 5 8' enable-background='new 0 0 5 8' xml:space='preserve'><defs></defs><path fill='#333333' d='M4.707,6.293c0.391,0.391,0.391,1.023,0,1.414C4.512,7.902,4.256,8,4,8S3.488,7.902,3.293,7.707l-3-3 C0.105,4.52,0,4.266,0,4s0.105-0.52,0.293-0.707l3-3c0.391-0.391,1.023-0.391,1.414,0c0.391,0.39,0.391,1.023,0,1.414L2.414,4 L4.707,6.293z'/></svg>");
-  border-bottom-left-radius: 2px;
-  border-top-left-radius: 2px;
-}
-.ebTextArea::-webkit-scrollbar-button:horizontal:increment {
-  background-image: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' width='5px' height='8px' viewBox='0 0 5 8' enable-background='new 0 0 5 8' xml:space='preserve'><defs></defs><path fill='#333333' d='M0.293,1.707c-0.391-0.391-0.391-1.023,0-1.414C0.488,0.098,0.744,0,1,0s0.512,0.098,0.707,0.293l3,3 C4.895,3.48,5,3.734,5,4s-0.105,0.52-0.293,0.707l-3,3c-0.391,0.391-1.023,0.391-1.414,0s-0.391-1.023,0-1.414L2.586,4L0.293,1.707z'/></svg>");
-  border-bottom-right-radius: 2px;
-  border-top-right-radius: 2px;
-}
-.ebTextArea_noMargin {
-  margin: 0;
-}
-.ebTextArea_txtCenter {
-  text-align: center;
-}
-.ebTextArea_miniW,
-.ebTextArea_width_mini {
-  width: 40px;
-}
-.ebTextArea_smallW,
-.ebTextArea_width_small {
-  width: 80px;
-}
-.ebTextArea_longW,
-.ebTextArea_width_long {
-  width: 180px;
-}
-.ebTextArea_xLongW,
-.ebTextArea_width_xLong {
-  width: 220px;
-}
-.ebTextArea_width_full {
-  min-width: 40px;
-  width: 100%;
-}
-.ebTextArea_noRightSide {
-  border-width: 1px 0 1px 1px;
-  border-radius: 3px 0 0 3px;
-}
-.ebTextArea_noLeftSide {
-  border-width: 1px 1px 1px 0;
-  border-radius: 0 3px 3px 0;
-}
-.ebTextArea:hover {
-  border-color: #666666;
-}
-.ebTextArea[readonly] {
-  cursor: text;
-  border-color: #E3E3E3;
-  background-color: #f0f0f0;
-  color: #b2b2b2;
-}
-.ebTextArea[readonly]:hover {
-  //border-color: #E3E3E3;
-}
-.ebTextArea_disabled,
-.ebTextArea:disabled {
-  color: #B2B2B2;
-  border-color: #B2B2B2;
-  background-color: rgba(0, 0, 0, 0.05);
-  -ms-touch-action: none;
-  touch-action: none;
-  -webkit-text-fill-color: #b2b2b2;
-  opacity: 1;
-  box-shadow: inset 1px 1px 0 0 #cccccc;
-}
-.ebTextArea_status_none {
-  border-color: #b3b3b3;
-}
-.ebTextArea_status_warning {
-  border-color: #f08a00;
-}
-.ebTextArea_status_error {
-  border-color: #e32119;
-}
-.ebTextArea:invalid:not(.ebTextArea_status_warning):not(.ebTextArea_status_none) {
-  border-color: #e32119;
-}
-
-/* Button */
-.ebBtn {
-  position: relative;
-  display: inline-block;
-  vertical-align: middle;
-  color: #333333;
-  background-color: #ffffff;
-  border: none;
-  min-width: 60px;
-  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2);
-  border-radius: 3px;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.1) 100%);
-  padding: 0 8px;
-  height: 2.4rem;
-  font-size: 1.2rem;
-  white-space: nowrap;
-  text-decoration: none;
-  text-align: center;
-  cursor: pointer;
-}
-a.ebBtn:hover {
-  color: #333;
-}
-a.ebBtn:focus,
-a.ebBtn:active,
-a.ebBtn_active {
-  text-decoration: none;
-}
-.ebBtn:focus {
-  outline: none;
-  box-shadow: 0 0 2px 1px #4d90fe, 0 0 0 1px rgba(0, 0, 0, 0.2) inset;
-}
-.ebBtn_color_blue,
-.ebBtn_color_darkBlue,
-.ebBtn_color_paleBlue,
-.ebBtn_color_darkGreen,
-.ebBtn_color_green,
-.ebBtn_color_orange,
-.ebBtn_color_red,
-.ebBtn_color_purple {
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.3) 100%);
-  color: #F0F0F0 !important;
-}
-.ebBtn_color_blue:hover,
-.ebBtn_color_darkBlue:hover,
-.ebBtn_color_paleBlue:hover,
-.ebBtn_color_darkGreen:hover,
-.ebBtn_color_green:hover,
-.ebBtn_color_orange:hover,
-.ebBtn_color_red:hover,
-.ebBtn_color_purple:hover {
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.1) 100%);
-}
-.ebBtn_color_blue {
-  background-color: #0966b3;
-}
-.ebBtn_color_darkBlue {
-  background-color: #0066b3;
-}
-.ebBtn_color_paleBlue {
-  background-color: #00A9D4;
-}
-.ebBtn_color_darkGreen {
-  background-color: #00625F;
-}
-.ebBtn_color_green {
-  background-color: #89BA17;
-}
-.ebBtn_color_orange {
-  background-color: #F08A00;
-}
-.ebBtn_color_red {
-  background-color: #E32119;
-}
-.ebBtn_color_purple {
-  background-color: #953882;
-}
-.ebBtn_small {
-  font-size: 1.1rem;
-  padding: 0 6px;
-  height: 2rem;
-}
-.ebBtn_large {
-  font-size: 1.4rem;
-  padding: 0 10px;
-  height: 3.8rem;
-}
-.ebBtn:hover {
-  text-decoration: none;
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.15) 100%);
-}
-.ebBtn_active,
-.ebBtn:active,
-.ebBtn_active:hover {
-  text-decoration: none;
-  box-shadow: inset 2px 2px 2.5px 0 rgba(0, 0, 0, 0.35), inset 0 0 0 1px rgba(0, 0, 0, 0.2);
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0.2) 100%);
-}
-.ebBtn:disabled,
-.ebBtn_disabled,
-.ebBtn:disabled:hover,
-.ebBtn_disabled:hover,
-.ebBtn:disabled:active,
-.ebBtn_disabled:active {
-  -ms-touch-action: none !important;
-  cursor: not-allowed !important;
-  touch-action: none !important;
-  background: rgba(0, 0, 0, 0.1);
-  color: #8d8d8d !important;
-}
-.ebBtn:disabled .ebIcon,
-.ebBtn_disabled .ebIcon {
-  opacity: 0.3;
-}
-.ebBtn_subtle {
-  background-image: none;
-  background-color: transparent;
-  box-shadow: none;
-  min-width: auto;
-}
-.ebBtn_subtle:hover {
-  background-image: none;
-  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2);
-}
-.ebBtn_subtle:focus {
-  box-shadow: 0 0 2px 1px #4d90fe, 0 0 0 1px rgba(0, 0, 0, 0.2) inset;
-}
-.ebBtn_subtle:active,
-.ebBtn_subtle.ebBtn_subtle_active {
-  text-decoration: none;
-  box-shadow: inset 2px 2px 2.5px 0 rgba(0, 0, 0, 0.35), inset 0 0 0 1px rgba(0, 0, 0, 0.2);
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0.2) 100%);
-}
-.ebBtn_subtle:disabled,
-.ebBtn_subtle.ebBtn_subtle_disabled,
-.ebBtn_subtle:disabled:hover,
-.ebBtn_subtle.ebBtn_subtle_disabled:hover,
-.ebBtn_subtle:disabled:active,
-.ebBtn_subtle.ebBtn_subtle_disabled:active {
-  background-color: transparent;
-  box-shadow: none;
-}
-.ebBtn:active:focus,
-.ebBtn_active:focus {
-  box-shadow: inset 2px 2px 2.5px 0 rgba(0, 0, 0, 0.35), inset 0 0 0 1px rgba(0, 0, 0, 0.2), 0 0 2px 1px #4d90fe;
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0.2) 100%);
-}
-
-/* Combobox */
-.ebCombobox {
-  position: relative;
-  display: inline-block;
-  vertical-align: middle;
-  white-space: nowrap;
-  margin: 0;
-  padding: 0;
-  height: 2.4rem;
-}
-.ebCombobox_width_full {
-  min-width: 70px;
-  width: 100%;
-}
-.ebCombobox_width_full .ebInput {
-  width: calc(100% - 30px);
-}
-.ebCombobox-list,
-.ebCombobox-body {
-  position: absolute;
-  margin-top: 6px;
-  display: none;
-  width: 100%;
-}
-.ebCombobox-list_rightAlign,
-.ebCombobox-body_rightAlign {
-  right: 0;
-}
-.ebCombobox-Helper,
-.ebCombobox-helper {
-  position: relative;
-  display: inline-block;
-  vertical-align: middle;
-  width: 30px;
-  /*height: 100%; ewwatkmi: replaced with 2.4rem below*/
-  height: 2.4rem;
-  cursor: pointer;
-  border: 1px solid #999999;
-  background-color: #ffffff;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  border-radius: 0 3px 3px 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  -ms-appearance: none;
-  appearance: none;
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.1) 100%);
-}
-.ebCombobox-Helper:hover,
-.ebCombobox-helper:hover {
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.15) 100%);
-}
-.ebCombobox-Helper:active,
-.ebCombobox-helper:active {
-  box-shadow: inset 2px 2px 3px 0 rgba(0, 0, 0, 0.35);
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0.2) 100%);
-}
-.ebCombobox-Helper:disabled,
-.ebCombobox-helper:disabled {
-  border-color: #b2b2b2;
-}
-.ebCombobox-Helper:disabled,
-.ebCombobox-helper:disabled,
-.ebCombobox-Helper:disabled:hover,
-.ebCombobox-helper:disabled:hover,
-.ebCombobox-Helper:disabled:active,
-.ebCombobox-helper:disabled:active {
-  -ms-touch-action: none !important;
-  cursor: not-allowed !important;
-  touch-action: none !important;
-  background: #e5e5e5;
-  color: #B2B2B2;
-  cursor: not-allowed;
-  box-shadow: none;
-}
-.ebCombobox-Helper .ebCombobox-iconHolder,
-.ebCombobox-helper .ebCombobox-iconHolder {
-  display: inline-block;
-  opacity: 0.7;
-  cursor: pointer;
-  line-height: 2.2rem;
-}
-.ebCombobox-Helper .ebCombobox-iconHolder .ebIcon,
-.ebCombobox-helper .ebCombobox-iconHolder .ebIcon {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  margin: auto;
-}
-.ebCombobox:hover > .ebCombobox-Helper,
-.ebCombobox:hover > .ebCombobox-helper {
-  border-color: #666666;
-}
-.ebCombobox .ebInput:focus ~ .ebCombobox-list,
-/*.ebCombobox .ebInput:focus ~ .ebCombobox-body,*/
-.ebCombobox:active > .ebCombobox-list,
-/*.ebCombobox:active > .ebCombobox-body*/ {
-  display: block;
-}
-.ebCombobox > .ebCombobox-list,
-.ebCombobox > .ebCombobox-body {
-  display: none;
-}
-.ebCombobox_noMargin {
-  margin: 0;
-}
-.ebCombobox_disabled,
-.ebCombobox_disabled *:hover {
-  -ms-touch-action: none !important;
-  cursor: not-allowed !important;
-  touch-action: none !important;
-}
-.ebCombobox_disabled .ebCombobox-iconHolder,
-.ebCombobox_disabled .ebCombobox-iconHolder:hover,
-.ebCombobox_disabled .ebCombobox-iconHolder:active {
-  -ms-touch-action: none !important;
-  cursor: not-allowed !important;
-  touch-action: none !important;
-  opacity: 0.3;
-}
-.ebCombobox_disabled:hover > .ebCombobox-Helper,
-.ebCombobox_disabled:hover > .ebCombobox-helper {
-  border-color: #b2b2b2;
-}
-.ebCombobox_disabled:active > .ebCombobox-list,
-.ebCombobox_disabled:active > .ebCombobox-body {
-  display: none;
-}
-.ebCombobox_disabled .ebInput:focus ~ .ebCombobox-list,
-.ebCombobox_disabled .ebInput:focus ~ .ebCombobox-body {
-  display: none;
-}
-.ebCombobox_status_warning .ebInput {
-  border-color: #f08a00;
-}
-.ebCombobox_status_error .ebInput {
-  border-color: #e32119;
-}
-
-/* Switcher */
-.ebSwitcher {
-  position: relative;
-  height: 24px;
-  width: 84px;
-  display: block;
-  overflow: hidden;
-  cursor: pointer;
-  border: 1px solid #ccc;
-  border-radius: 3px;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -o-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-}
-.ebSwitcher-checkbox {
-  display: none;
-}
-.ebSwitcher-body {
-  position: relative;
-  font-size: 0;
-  white-space: nowrap;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  transition: left 0.2s linear;
-}
-.ebSwitcher-onLabel,
-.ebSwitcher-switch,
-.ebSwitcher-offLabel {
-  display: inline-block;
-  vertical-align: top;
-  overflow: hidden;
-  height: 100%;
-}
-.ebSwitcher-onLabel,
-.ebSwitcher-offLabel {
-  width: calc(100% - 24px);
-  line-height: 2.4rem;
-  color: white;
-  text-align: center;
-  font-size: 1.2rem;
-}
-.ebSwitcher-onLabel {
-  background-color: #89ba17;
-}
-.ebSwitcher-offLabel {
-  background-color: #999999;
-}
-.ebSwitcher-switch {
-  height: 24px;
-  width: 24px;
-  transition: left 0.2s;
-}
-.ebSwitcher-switch::after {
-  content: "";
-  position: absolute;
-  margin: -1px;
-  width: 24px;
-  height: 24px;
-  display: inline-block;
-  background: #ffffff;
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.1) 100%);
-  border-radius: 3px;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-}
-.ebSwitcher-checkbox:not(:checked) + .ebSwitcher-body {
-  left: calc(-100% + 24px);
-}
-.ebSwitcher:focus {
-  /*
-        outline: #4d90fe auto 5px;
-        box-shadow: 0 0 0 1px #4d90fe;
-        -webkit-box-shadow: none;
-        */
-  outline: none;
-  box-shadow: 0 0 2px 1px #4d90fe;
-}
-.ebSwitcher_status_warning {
-  border-color: #f08a00;
-}
-.ebSwitcher_status_error {
-  border-color: #e32119;
-}
-.ebSwitcher_disabled {
-  cursor: not-allowed;
-}
-.ebSwitcher_disabled .ebSwitcher-onLabel,
-.ebSwitcher_disabled .ebSwitcher-offLabel,
-.ebSwitcher_disabled .ebSwitcher-switch::after {
-  background-color: #e5e5e5;
-  background-image: none;
-  color: #8d8d8d;
-}
-
-/* Dropdown */
-.ebDropdown {
-  position: relative;
-  display: inline-block;
-  height: 2.4rem;
-  padding: 0;
-  margin: 0;
-}
-.ebDropdown-list,
-.ebDropdown-body {
-  position: absolute;
-  margin-top: 6px;
-  display: none;
-  min-width: 100%;
-}
-.ebDropdown-list_rightAlign,
-.ebDropdown-body_rightAlign {
-  right: 0;
-}
-.ebDropdown-Header,
-.ebDropdown-header {
-  position: relative;
-  display: inline-block;
-  vertical-align: middle;
-  height: 100%;
-  min-width: 60px;
-  margin: 0;
-  padding: 6px 8px;
-  line-height: 1.2rem;
-  font-size: 1.2rem;
-  text-align: left;
-  text-decoration: none;
-  white-space: nowrap;
-  color: #333333;
-  background-color: #ffffff;
-  border: none;
-  cursor: pointer;
-  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2);
-  border-radius: 3px;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.1) 100%);
-}
-.ebDropdown-Header:hover,
-.ebDropdown-header:hover {
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.15) 100%);
-}
-.ebDropdown-Header:active,
-.ebDropdown-header:active {
-  box-shadow: inset 2px 2px 2.5px 0 rgba(0, 0, 0, 0.35), inset 0 0 0 1px rgba(0, 0, 0, 0.2);
-  background-image: linear-gradient(180deg, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0.2) 100%);
-}
-.ebDropdown-Header .ebDropdown-caption,
-.ebDropdown-header .ebDropdown-caption {
-  display: inline-block;
-  padding: 0 4px 0 0;
-  vertical-align: middle;
-  min-width: 27px;
-}
-.ebDropdown-Header .ebDropdown-iconHolder,
-.ebDropdown-header .ebDropdown-iconHolder {
-  display: inline-block;
-  cursor: pointer;
-  opacity: 0.7;
-}
-.ebDropdown .ebDropdown-Header:focus + .ebDropdown-list,
-.ebDropdown .ebDropdown-header:focus + .ebDropdown-body,
-.ebDropdown .ebDropdown-Header:active + .ebDropdown-list,
-.ebDropdown .ebDropdown-header:active + .ebDropdown-body,
-.ebDropdown:focus > .ebDropdown-list,
-.ebDropdown:focus > .ebDropdown-body,
-.ebDropdown:active > .ebDropdown-list,
-.ebDropdown:active > .ebDropdown-body {
-  display: block;
-}
-.ebDropdown_disabled .ebDropdown-Header,
-.ebDropdown_disabled .ebDropdown-header {
-  background: rgba(0, 0, 0, 0.1);
-  color: #B2B2B2;
-}
-.ebDropdown_disabled .ebDropdown-Header,
-.ebDropdown_disabled .ebDropdown-header,
-.ebDropdown_disabled .ebDropdown-Header:hover,
-.ebDropdown_disabled .ebDropdown-header:hover,
-.ebDropdown_disabled .ebDropdown-Header:active,
-.ebDropdown_disabled .ebDropdown-header:active {
-  -ms-touch-action: none !important;
-  cursor: not-allowed !important;
-  touch-action: none !important;
-}
-.ebDropdown_disabled .ebDropdown-Header:hover,
-.ebDropdown_disabled .ebDropdown-header:hover,
-.ebDropdown_disabled .ebDropdown-Header:active,
-.ebDropdown_disabled .ebDropdown-header:active {
-  background: rgba(0, 0, 0, 0.1);
-  color: #B2B2B2;
-  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2);
-}
-.ebDropdown_disabled .ebDropdown-Header .ebDropdown-iconHolder,
-.ebDropdown_disabled .ebDropdown-header .ebDropdown-iconHolder,
-.ebDropdown_disabled .ebDropdown-Header .ebDropdown-iconHolder:hover,
-.ebDropdown_disabled .ebDropdown-header .ebDropdown-iconHolder:hover,
-.ebDropdown_disabled .ebDropdown-Header .ebDropdown-iconHolder:active,
-.ebDropdown_disabled .ebDropdown-header .ebDropdown-iconHolder:active {
-  -ms-touch-action: none !important;
-  cursor: not-allowed !important;
-  touch-action: none !important;
-  opacity: 0.3;
-}
-.ebDropdown_disabled .ebDropdown-Header:focus + .ebDropdown-list,
-.ebDropdown_disabled .ebDropdown-header:focus + .ebDropdown-body,
-.ebDropdown_disabled .ebDropdown-Header:active + .ebDropdown-list,
-.ebDropdown_disabled .ebDropdown-header:active + .ebDropdown-body,
-.ebDropdown_disabled:focus > .ebDropdown-list,
-.ebDropdown_disabled:focus > .ebDropdown-body,
-.ebDropdown_disabled:active > .ebDropdown-list,
-.ebDropdown_disabled:active > .ebDropdown-body {
-  display: none;
-}
-
-/* Icons */
-.ebIcon {
-  display: inline-block;
-  vertical-align: middle;
-  border: none;
-  height: 16px;
-  width: 16px;
-  line-height: 1.6rem;
-  background-repeat: no-repeat;
-  background-position: center;
-  background-color: transparent;
-  background-size: 100%;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -o-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-  /*small icons  */
-  /*16px icons*/
-}
-.ebIcon_interactive {
-  opacity: 0.7;
-  cursor: pointer;
-}
-.ebIcon_interactive:hover {
-  opacity: 1.0;
-}
-.ebIcon_interactive:active {
-  opacity: 0.4;
-}
-.ebIcon_button {
-  margin: 10px;
-}
-.ebIcon_noVertAlign {
-  vertical-align: inherit;
-}
-.ebIcon_disabled {
-  cursor: default;
-}
-.ebIcon_disabled,
-.ebIcon_disabled:hover,
-.ebIcon_disabled:active {
-  opacity: 0.3;
-}
-.ebIcon_small {
-  width: 1rem;
-  height: 1rem;
-  line-height: 1rem;
-}
-.ebIcon_big {
-  width: 2rem;
-  height: 2rem;
-  line-height: 2rem;
-}
-.ebIcon_large {
-  width: 2.8rem;
-  height: 2.8rem;
-  line-height: 2.8rem;
-}
-.ebIcon_wMargin {
-  margin: 4px;
-}
-.ebIcon_upArrow {
-  background-image: url('../resources/16px/ArrowUpSmall_black_16px.svg');
-}
-.ebIcon_upArrow_white {
-  background-image: url('../resources/16px/arrowUpSmall_white_16px.svg');
-}
-.ebIcon_downArrow {
-  background-image: url('../resources/16px/ArrowDownSmall_black_16px.svg');
-}
-.ebIcon_downArrow_white {
-  background-image: url('../resources/16px/ArrowDownSmall_white_16px.svg');
-}
-.ebIcon_leftArrow {
-  background-image: url('../resources/16px/ArrowLeftSmall_black_16px.svg');
-}
-.ebIcon_leftArrow_white {
-  background-image: url('../resources/16px/ArrowLeftSmall_white_16px.svg');
-}
-.ebIcon_rightArrow {
-  background-image: url('../resources/16px/ArrowRightSmall_black_16px.svg');
-}
-.ebIcon_rightArrow_white {
-  background-image: url('../resources/16px/ArrowRightSmall_white_16px.svg');
-}
-.ebIcon_prevArrow {
-  background-image: url('../resources/16px/ArrowDoubleLeftSmall_black_16px.svg');
-}
-.ebIcon_nextArrow {
-  background-image: url('../resources/16px/ArrowDoubleRightSmall_black_16px.svg');
-}
-.ebIcon_upArrow_10px {
-  background-image: url('../resources/10px/ArrowUpSmall_black_10px.svg');
-}
-.ebIcon_downArrow_10px {
-  background-image: url('../resources/10px/ArrowDownSmall_black_10px.svg');
-}
-.ebIcon_leftArrow_10px {
-  background-image: url('../resources/10px/ArrowLeftSmall_black_10px.svg');
-}
-.ebIcon_rightArrow_10px {
-  background-image: url('../resources/10px/ArrowRightSmall_black_10px.svg');
-}
-.ebIcon_prevArrow_10px {
-  background-image: url('../resources/10px/ArrowDoubleLeftSmall_black_10px.svg');
-}
-.ebIcon_nextArrow_10px {
-  background-image: url('../resources/10px/ArrowDoubleRightSmall_black_10px.svg');
-}
-.ebIcon_errorSmall {
-  background-image: url('../resources/other/errorSmall_red_10px.svg');
-}
-.ebIcon_tickSmallBlack {
-  background-image: url('../resources/other/tick_black_10x8px.svg');
-}
-.ebIcon_tickSmallGreen {
-  background-image: url('../resources/other/tick_green_10x8px.svg');
-}
-.ebIcon_upArrowLarge {
-  background-image: url('../resources/16px/ArrowUp_black_16px.svg');
-}
-.ebIcon_upArrowLarge_white {
-  background-image: url('../resources/16px/ArrowUp_white_16px.svg');
-}
-.ebIcon_downArrowLarge {
-  background-image: url('../resources/16px/ArrowDown_black_16px.svg');
-}
-.ebIcon_downArrowLarge_white {
-  background-image: url('../resources/16px/ArrowDown_white_16px.svg');
-}
-.ebIcon_downArrowLarge_blue {
-  background-image: url('../resources/16px/ArrowDown_blue_16px.svg');
-}
-.ebIcon_leftArrowLarge {
-  background-image: url('../resources/16px/ArrowLeft_black_16px.svg');
-}
-.ebIcon_leftArrowLarge_white {
-  background-image: url('../resources/16px/ArrowLeft_white_16px.svg');
-}
-.ebIcon_rightArrowLarge {
-  background-image: url('../resources/16px/ArrowRight_black_16px.svg');
-}
-.ebIcon_rightArrowLarge_white {
-  background-image: url('../resources/16px/ArrowRight_white_16px.svg');
-}
-.ebIcon_circleArrowDown {
-  background-image: url('../resources/16px/circleArrowDown_black_16px.svg');
-}
-.ebIcon_circleArrowDown_white {
-  background-image: url('../resources/16px/circleArrowDown_white_16px.svg');
-}
-.ebIcon_circleArrowLeft {
-  background-image: url('../resources/16px/circleArrowLeft_black_16px.svg');
-}
-.ebIcon_circleArrowLeft_white {
-  background-image: url('../resources/16px/circleArrowLeft_white_16px.svg');
-}
-.ebIcon_circleArrowRight {
-  background-image: url('../resources/16px/circleArrowRight_black_16px.svg');
-}
-.ebIcon_circleArrowRight_white {
-  background-image: url('../resources/16px/circleArrowRight_white_16px.svg');
-}
-.ebIcon_circleArrowUp {
-  background-image: url('../resources/16px/circleArrowUp_black_16px.svg');
-}
-.ebIcon_circleArrowUp_white {
-  background-image: url('../resources/16px/circleArrowUp_white_16px.svg');
-}
-.ebIcon_circleCaretDown {
-  background-image: url('../resources/16px/circleCaretDown_black_16px.svg');
-}
-.ebIcon_circleCaretDown_white {
-  background-image: url('../resources/16px/circleCaretDown_white_16px.svg');
-}
-.ebIcon_circleCaretLeft {
-  background-image: url('../resources/16px/circleCaretLeft_black_16px.svg');
-}
-.ebIcon_circleCaretLeft_white {
-  background-image: url('../resources/16px/circleCaretLeft_white_16px.svg');
-}
-.ebIcon_circleCaretRight {
-  background-image: url('../resources/16px/circleCaretRight_black_16px.svg');
-}
-.ebIcon_circleCaretRight_white {
-  background-image: url('../resources/16px/circleCaretRight_white_16px.svg');
-}
-.ebIcon_circleCaretUp {
-  background-image: url('../resources/16px/circleCaretUp_black_16px.svg');
-}
-.ebIcon_circleCaretUp_white {
-  background-image: url('../resources/16px/circleCaretUp_white_16px.svg');
-}
-.ebIcon_eLogo {
-  background-image: url('../resources/systemBar/econ01.svg');
-}
-.ebIcon_comment {
-  background-image: url('../resources/16px/Comment_black_16px.svg');
-}
-.ebIcon_comment_white {
-  background-image: url('../resources/16px/comment_white.svg');
-}
-.ebIcon_copy {
-  background-image: url('../resources/16px/copy_black_16px.svg');
-}
-.ebIcon_copy_white {
-  background-image: url('../resources/16px/copy_white_16px.svg');
-}
-.ebIcon_cut {
-  background-image: url('../resources/16px/cut_black.svg');
-}
-.ebIcon_cut_white {
-  background-image: url('../resources/16px/cut_white.svg');
-}
-.ebIcon_delete {
-  background-image: url('../resources/16px/delete_black_16px.svg');
-}
-.ebIcon_delete_white {
-  background-image: url('../resources/16px/delete_white_16px.svg');
-}
-.ebIcon_duplicate {
-  background-image: url('../resources/16px/duplicate_black_16px.svg');
-}
-.ebIcon_duplicate_white {
-  background-image: url('../resources/16px/duplicate_white_16px.svg');
-}
-.ebIcon_edit {
-  background-image: url('../resources/16px/edit_black_16px.svg');
-}
-.ebIcon_editWhite {
-  background-image: url('../resources/16px/edit_white_16px.svg');
-}
-.ebIcon_newFile {
-  background-image: url('../resources/16px/newFile_black_16px.svg');
-}
-.ebIcon_newFile_white {
-  background-image: url('../resources/16px/newFile_white_16px.svg');
-}
-.ebIcon_save {
-  background-image: url('../resources/16px/save_black_16px.svg');
-}
-.ebIcon_save_white {
-  background-size: contain;
-  background-image: url('../resources/16px/save_white.svg');
-}
-.ebIcon_filter {
-  background-image: url('../resources/16px/filter_black_16px.svg');
-}
-.ebIcon_filterOn {
-  background-image: url('../resources/16px/filters_on.svg');
-}
-.ebIcon_filterOff {
-  background-image: url('../resources/16px/filters_off.svg');
-}
-.ebIcon_filter_white {
-  background-image: url('../resources/16px/filter_white_16px.svg');
-}
-.ebIcon_folder {
-  background-image: url('../resources/16px/folder_black_16px.svg');
-}
-.ebIcon_folder_white {
-  background-image: url('../resources/16px/folder_white_16px.svg');
-}
-.ebIcon_folderClosed {
-  background-image: url('../resources/16px/folderClosed_black.svg');
-}
-.ebIcon_folderClosed_white {
-  background-image: url('../resources/16px/folderClosed_white.svg');
-}
-.ebIcon_detach {
-  background-image: url('../resources/16px/detach_black_16px.svg');
-}
-.ebIcon_detach_white {
-  background-size: contain;
-  background-image: url('../resources/16px/detach_white.svg');
-}
-.ebIcon_import {
-  background-image: url('../resources/16px/import_black.svg');
-}
-.ebIcon_import_white {
-  background-image: url('../resources/16px/import_white.svg');
-}
-.ebIcon_export {
-  background-image: url('../resources/16px/export_black_16px.svg');
-}
-.ebIcon_export_white {
-  background-image: url('../resources/16px/export_white.svg');
-}
-.ebIcon_undo {
-  background-image: url('../resources/16px/undo_black_16px.svg');
-}
-.ebIcon_undo_white {
-  background-image: url('../resources/16px/undo_white_16px.svg');
-}
-.ebIcon_cancelled {
-  background-image: url('../resources/16px/Cancelled_Black_16px.svg');
-}
-.ebIcon_draft {
-  background-size: contain;
-  background-image: url('../resources/16px/draft.svg');
-}
-.ebIcon_importExport {
-  background-image: url('../resources/16px/import_export.svg');
-}
-.ebIcon_login {
-  background-image: url('../resources/16px/login.svg');
-}
-.ebIcon_move {
-  background-image: url('../resources/16px/move.svg');
-}
-.ebIcon_remove {
-  background-image: url('../resources/16px/remove.svg');
-}
-.ebIcon_valid {
-  background-image: url('../resources/16px/valid_icon.svg');
-}
-.ebIcon_invalid {
-  background-image: url('../resources/16px/invalid_icon.svg');
-}
-.ebIcon_error {
-  background-image: url('../resources/16px/error_red_16px.svg');
-}
-.ebIcon_warning {
-  background-image: url('../resources/16px/warning_yellow_16px.svg');
-}
-.ebIcon_warningOrange {
-  background-image: url('../resources/16px/warning_orange_16px.svg');
-}
-.ebIcon_warning_white {
-  background-image: url('../resources/16px/warning_white.svg');
-}
-.ebIcon_warningShield {
-  background-image: url('../resources/16px/warningShield_black_16px.svg');
-}
-.ebIcon_warningShield_white {
-  background-size: contain;
-  background-image: url('../resources/16px/warningShield_white.svg');
-}
-.ebIcon_mail {
-  background-image: url('../resources/16px/mail_black_16px.svg');
-}
-.ebIcon_mail_white {
-  background-image: url('../resources/16px/mail_white_16px.svg');
-}
-.ebIcon_mailRead {
-  background-image: url('../resources/16px/mailRead_black_16px.svg');
-}
-.ebIcon_mailRead_white {
-  background-image: url('../resources/16px/mailRead_white_16px.svg');
-}
-.ebIcon_link {
-  background-image: url('../resources/16px/Link_black_16px.svg');;
-}
-.ebIcon_lock {
-  background-image: url('../resources/16px/lock_black_16px.svg');
-}
-.ebIcon_lock_white {
-  background-image: url('../resources/16px/lock_white_16px.svg');
-}
-.ebIcon_unlock {
-  background-image: url('../resources/16px/unlock_black_16px.svg');
-}
-.ebIcon_unlock_white {
-  background-image: url('../resources/16px/unlock_white_16px.svg');
-}
-.ebIcon_logout {
-  background-image: url('../resources/16px/logout_black_16px.svg');
-}
-.ebIcon_menu {
-  background-image: url('../resources/16px/menu_black_16px.svg');
-}
-.ebIcon_menu_white {
-  background-image: url('../resources/16px/menu_white_16px.svg');
-}
-.ebIcon_search {
-  background-image: url('../resources/16px/search_black_16px.svg');
-}
-.ebIcon_searchWhite {
-  background-image: url('../resources/16px/search_white_16px.svg');
-}
-.ebIcon_advancedSearch {
-  background-image: url('../resources/16px/advanced_search_black_16px.svg');
-}
-.ebIcon_advancedSearchWhite {
-  background-image: url('../resources/16px/advanced_search_white_16px.svg');
-}
-.ebIcon_share {
-  background-image: url('../resources/16px/share_black_16px.svg');
-}
-.ebIcon_share_white {
-  background-image: url('../resources/16px/share_white.svg');
-}
-.ebIcon_star {
-  background-image: url('../resources/16px/star_black_16px.svg');
-}
-.ebIcon_star_white {
-  background-image: url('../resources/16px/star_white_16px.svg');
-}
-.ebIcon_star_yellow {
-  background-image: url('../resources/16px/star_yellow_16px.svg');
-}
-.ebIcon_starOutline {
-  background-image: url('../resources/16px/star_outline_black_16px.svg');
-}
-.ebIcon_starOutline_white {
-  background-image: url('../resources/16px/star_outline_white_16px.svg');
-}
-.ebIcon_starOutline_yellow {
-  background-image: url('../resources/16px/star_outline_yellow_16px.svg');
-}
-.ebIcon_tick {
-  background-image: url('../resources/16px/tick_green_16px.svg');
-}
-.ebIcon_tick_black {
-  background-image: url('../resources/16px/tick_16px.svg');
-}
-.ebIcon_simpleGreenTick {
-  background-image: url('../resources/16px/simple_green_tick.svg');
-}
-.ebIcon_simpleTick_black {
-  background-image: url('../resources/16px/simple_tick.svg');
-}
-.ebIcon_download {
-  background-image: url('../resources/16px/download_black.svg');
-}
-.ebIcon_download_white {
-  background-image: url('../resources/16px/download_white.svg');
-}
-.ebIcon_downloadWhite {
-  background-image: url('../resources/16px/download_white_16px.svg');
-}
-.ebIcon_documentWhite {
-  background-image: url('../resources/16px/document_white_16px.svg');
-}
-.ebIcon_expand {
-  background-image: url('../resources/16px/expand_black_16px.svg');
-}
-.ebIcon_rowCollapsed {
-  background-image: url('../resources/16px/rowCollapsed_black_16px.svg');
-}
-.ebIcon_rowExpanded {
-  background-image: url('../resources/16px/rowExpanded_black_16px.svg');
-}
-.ebIcon_rowView {
-  background-image: url('../resources/16px/rowView_black_16px.svg');
-}
-.ebIcon_rowView_white {
-  background-image: url('../resources/16px/rowView_white.svg');
-}
-.ebIcon_externalApp {
-  background-image: url('../resources/16px/externalApp_black_16px.svg');
-}
-.ebIcon_externalApp_white {
-  background-image: url('../resources/16px/externalApp_white_16px.svg');
-}
-.ebIcon_fullscreen {
-  background-image: url('../resources/16px/fullscreen_black_16px.svg');
-}
-.ebIcon_fullscreenMinimize {
-  background-image: url('../resources/16px/fullscreenMinimise_black_16px.svg');
-}
-.ebIcon_help {
-  background-image: url('../resources/16px/help_black_16px.svg');
-}
-.ebIcon_help_white {
-  background-image: url('../resources/16px/help_white.svg');
-}
-.ebIcon_info {
-  background-image: url('../resources/16px/info_black.svg');
-}
-.ebIcon_info_white {
-  background-image: url('../resources/16px/info_white.svg');
-}
-.ebIcon_dialogInfo {
-  background-image: url('../resources/16px/dialogInfo_blue.svg');
-}
-.ebIcon_dialogInfo_white {
-  background-image: url('../resources/16px/dialogInfo_white.svg');
-}
-.ebIcon_infoMsgIndicator {
-  background-image: url('../resources/16px/infoMsgIndicator_16px.svg');
-}
-.ebIcon_exitFullscreen {
-  background-image: url('../resources/16px/minimiseFullscreen_black_16px.svg');
-}
-.ebIcon_refresh {
-  background-image: url('../resources/16px/refresh_black_16px.svg');
-}
-.ebIcon_refresh_white {
-  background-image: url('../resources/16px/refresh_white_16px.svg');
-}
-.ebIcon_settings {
-  background-image: url('../resources/16px/settings_black_16px.svg');
-}
-.ebIcon_settings_white {
-  background-image: url('../resources/16px/settings_white_16px.svg');
-}
-.ebIcon_user {
-  background-image: url('../resources/16px/user_black_16px.svg');
-}
-.ebIcon_user_white {
-  background-image: url('../resources/16px/user_white_16px.svg');
-}
-.ebIcon_close {
-  background-image: url('../resources/16px/X_black_16px.svg');
-}
-.ebIcon_close_white {
-  background-image: url('../resources/16px/close_white_16px.svg');
-}
-.ebIcon_close_blue {
-  background-image: url('../resources/16px/X_blue_16px.svg');
-}
-.ebIcon_close_paleBlue {
-  background-image: url('../resources/16px/X_paleBlue_16px.svg');
-}
-.ebIcon_close_green {
-  background-image: url('../resources/16px/X_green_16px.svg');
-}
-.ebIcon_close_orange {
-  background-image: url('../resources/16px/X_orange_16px.svg');
-}
-.ebIcon_close_red {
-  background-image: url('../resources/16px/X_red_16px.svg');
-}
-.ebIcon_close_yellow {
-  background-image: url('../resources/16px/X_yellow_16px.svg');
-}
-.ebIcon_minus {
-  background-image: url('../resources/16px/minus_black_16px.svg');
-}
-.ebIcon_plus {
-  background-image: url('../resources/16px/plus_black_16px.svg');
-}
-.ebIcon_add {
-  background-image: url('../resources/16px/add_black_16px.svg');
-}
-.ebIcon_add_white {
-  background-image: url('../resources/16px/add_white_16px.svg');
-}
-.ebIcon_multiSelect {
-  background-image: url('../resources/16px/multiSelect_black_16px.svg');
-}
-.ebIcon_multiSelect_white {
-  background-size: contain;
-  background-image: url('../resources/16px/multiSelect_white.svg');
-}
-.ebIcon_multiSort {
-  background-image: url('../resources/16px/multi-sort.svg');
-}
-.ebIcon_multiSort_white {
-  background-image: url('../resources/16px/multi-sort_white.svg');
-}
-.ebIcon_sort {
-  background-image: url('../resources/16px/sort.svg');
-}
-.ebIcon_sort_white {
-  background-image: url('../resources/16px/sort_white.svg');
-}
-.ebIcon_stop {
-  background-image: url('../resources/16px/stop_black_16px.svg');
-}
-.ebIcon_pause {
-  background-image: url('../resources/16px/pause_black_16px.svg');
-}
-.ebIcon_suspend {
-  background-image: url('../resources/16px/suspend_black_16px.svg');
-}
-.ebIcon_resume {
-  background-image: url('../resources/16px/resume_black_16px.svg');
-}
-.ebIcon_play {
-  background-image: url('../resources/16px/play_black_16px.svg');
-}
-.ebIcon_fastForward {
-  background-image: url('../resources/16px/fastForward_black_16px.svg');
-}
-.ebIcon_fastRewind {
-  background-image: url('../resources/16px/fastRewind_black_16px.svg');
-}
-.ebIcon_print {
-  background-image: url('../resources/16px/print_black_16px.svg');
-}
-.ebIcon_print_white {
-  background-image: url('../resources/16px/print_white_16px.svg');
-}
-.ebIcon_calendar {
-  background-image: url('../resources/16px/calendar_black_16px.svg');
-}
-.ebIcon_calendar_white {
-  background-image: url('../resources/16px/calendar_white_16px.svg');
-}
-.ebIcon_addToFolder {
-  background-image: url('../resources/16px/addToFolder_black.svg');
-}
-.ebIcon_addToFolder_white {
-  background-image: url('../resources/16px/addToFolder_white.svg');
-}
-.ebIcon_alarmCleared {
-  background-image: url('../resources/16px/alarmCleared_16px.svg');
-}
-.ebIcon_alarmCleared_white {
-  background-image: url('../resources/16px/alarmCleared_white_16px.svg');
-}
-.ebIcon_alarmCritical {
-  background-image: url('../resources/16px/alarmCritical_16px.svg');
-}
-.ebIcon_alarmCritical_white {
-  background-image: url('../resources/16px/alarmCritical_white_16px.svg');
-}
-.ebIcon_alarmHeartbeat {
-  background-image: url('../resources/16px/alarmHeartbeat_16px.svg');
-}
-.ebIcon_alarmIndeterminate {
-  background-image: url('../resources/16px/alarmIndeterminate_16px.svg');
-}
-.ebIcon_alarmIndeterminate_white {
-  background-image: url('../resources/16px/alarmIndeterminate_white_16px.svg');
-}
-.ebIcon_alarmMajor {
-  background-image: url('../resources/16px/alarmMajor_16px.svg');
-}
-.ebIcon_alarmMajor_white {
-  background-image: url('../resources/16px/alarmMajor_white_16px.svg');
-}
-.ebIcon_alarmMinor {
-  background-image: url('../resources/16px/alarmMinor_16px.svg');
-}
-.ebIcon_alarmMinor_white {
-  background-image: url('../resources/16px/alarmMinor_white_16px.svg');
-}
-.ebIcon_alarmWarning {
-  background-image: url('../resources/16px/alarmWarning_16px.svg');
-}
-.ebIcon_alarmWarning_white {
-  background-image: url('../resources/16px/alarmWarning_white_16px.svg');
-}
-.ebIcon_alarmOtherGrouping {
-  background-image: url('../resources/16px/alarmOtherGrouping_16px.svg');
-}
-.ebIcon_alarmUnacknowledged {
-  background-image: url('../resources/16px/alarmUnacknowledged.svg');
-}
-.ebIcon_alarmUnacknowledged_white {
-  background-image: url('../resources/16px/alarmUnacknowledged_white.svg');
-}
-.ebIcon_alarmUnspecified {
-  background-image: url('../resources/16px/alarmUnspecified_16px.svg');
-}
-.ebIcon_acknowledgeAlarm {
-  background-image: url('../resources/16px/acknowledgeAlarm.svg');
-}
-.ebIcon_acknowledgeAlarm_white {
-  background-image: url('../resources/16px/acknowledgeAlarm_white.svg');
-}
-.ebIcon_clearAlarm {
-  background-image: url('../resources/16px/clearAlarm.svg');
-}
-.ebIcon_clearAlarm_white {
-  background-image: url('../resources/16px/clearAlarm_white.svg');
-}
-.ebIcon_bsc {
-  background-image: url('../resources/16px/BSC_black_16px.svg');
-}
-.ebIcon_bscYellow {
-  background-image: url('../resources/16px/BSC_Yellow_16px.svg');
-}
-.ebIcon_bscFunction {
-  background-image: url('../resources/16px/BSCFunction_black_16px.svg');
-}
-.ebIcon_bscFunctionYellow {
-  background-image: url('../resources/16px/BSCFunction_Yellow_16px.svg');
-}
-.ebIcon_cabinet {
-  background-image: url('../resources/16px/cabinet_black_16px.svg');
-}
-.ebIcon_cellGray {
-  background-image: url('../resources/16px/cell_gray_16px.svg');
-}
-.ebIcon_cellGreen {
-  background-image: url('../resources/16px/cell_green_16px.svg');
-}
-.ebIcon_cellRed {
-  background-image: url('../resources/16px/cell_red_16px.svg');
-}
-.ebIcon_cellAdjacent {
-  background-image: url('../resources/16px/cellAdjacent_16px.svg');
-}
-.ebIcon_cellExternal {
-  background-image: url('../resources/16px/cellExternal_16px.svg');
-}
-.ebIcon_charging {
-  background-image: url('../resources/16px/charging_black.svg');
-}
-.ebIcon_charging_white {
-  background-size: contain;
-  background-image: url('../resources/16px/charging_white.svg');
-}
-.ebIcon_connected {
-  background-image: url('../resources/16px/connected_black_16px.svg');
-}
-.ebIcon_disconnected {
-  background-image: url('../resources/16px/disconnected_black_16px.svg');
-}
-.ebIcon_connectionError {
-  background-image: url('../resources/16px/connectionError_black_16px.svg');
-}
-.ebIcon_core {
-  background-image: url('../resources/16px/core_black_16px.svg');
-}
-.ebIcon_coreSubscriber {
-  background-image: url('../resources/16px/coreSubscriber_black_16px.svg');
-}
-.ebIcon_database {
-  background-image: url('../resources/16px/database_black_16px.svg');
-}
-.ebIcon_ftpServer {
-  background-image: url('../resources/16px/ftpServer_black_16px.svg');
-}
-.ebIcon_ftpServerFunction {
-  background-image: url('../resources/16px/ftpServerFunction_black_16px.svg');
-}
-.ebIcon_gatewayFunction {
-  background-image: url('../resources/16px/gatewayFunction_black_16px.svg');
-}
-.ebIcon_grabHandle {
-  background-image: url('../resources/16px/grabHandle_black_16px.svg');
-}
-.ebIcon_grabHandle_white {
-  background-size: contain;
-  background-image: url('../resources/16px/grabHandle_white.svg');
-}
-.ebIcon_managedFunction {
-  background-image: url('../resources/16px/managedFunction_black_16px.svg');
-}
-.ebIcon_managedGroup {
-  background-image: url('../resources/16px/managedGroup_black_16px.svg');
-}
-.ebIcon_managementNode {
-  background-image: url('../resources/16px/managementNode_black_16px.svg');
-}
-.ebIcon_network {
-  background-image: url('../resources/16px/network_black_16px.svg');
-}
-.ebIcon_networkElement {
-  background-image: url('../resources/16px/networkElement_black_16px.svg');
-}
-.ebIcon_networkElement_white {
-  background-image: url('../resources/16px/networkElement_white_16px.svg');
-}
-.ebIcon_rbs {
-  background-image: url('../resources/16px/RBS_black_16px.svg');
-}
-.ebIcon_rbs_white {
-  background-image: url('../resources/16px/RBS_white_16px.svg');
-}
-.ebIcon_routeSwitch {
-  background-image: url('../resources/16px/routeSwitch.svg');
-}
-.ebIcon_rxi {
-  background-image: url('../resources/16px/rxi_black_16px.svg');
-}
-.ebIcon_switchFunction {
-  background-image: url('../resources/16px/switchFunction_black_16px.svg');
-}
-.ebIcon_technicianPresent {
-  background-image: url('../resources/16px/technicianPresent_16px.svg');
-}
-.ebIcon_terminal {
-  background-image: url('../resources/16px/terminal_black_16px.svg');
-}
-.ebIcon_topology {
-  background-image: url('../resources/16px/topology_black_16px.svg');
-}
-.ebIcon_access {
-  background-image: url('../resources/16px/access_black_16px.svg');
-}
-.ebIcon_access_white {
-  background-image: url('../resources/16px/access_white_16px.svg');
-}
-.ebIcon_accessSettings {
-  background-image: url('../resources/16px/accessSettings_black_16px.svg');
-}
-.ebIcon_accessSettings_white {
-  background-image: url('../resources/16px/accessSettings_white_16px.svg');
-}
-.ebIcon_alignCenter {
-  background-image: url('../resources/16px/alignCenter_black_16px.svg');
-}
-.ebIcon_alignCenter_white {
-  background-image: url('../resources/16px/alignCenter_white.svg');
-}
-.ebIcon_alignLeft {
-  background-image: url('../resources/16px/alignLeft_black_16px.svg');
-}
-.ebIcon_alignLeft_white {
-  background-image: url('../resources/16px/alignLeft_white.svg');
-}
-.ebIcon_alignRight {
-  background-image: url('../resources/16px/alignRight_black_16px.svg');
-}
-.ebIcon_alignRight_white {
-  background-image: url('../resources/16px/alignRight_white.svg');
-}
-.ebIcon_cli {
-  background-image: url('../resources/16px/CommandLineInterface_black_16px.svg');
-}
-.ebIcon_cli_white {
-  background-image: url('../resources/16px/CommandLineInterface_white_16px.svg');
-}
-.ebIcon_controllingNode {
-  background-image: url('../resources/16px/controllingNode.svg');
-}
-.ebIcon_grid3x3 {
-  background-image: url('../resources/16px/grid3X3_black_16px.svg');
-}
-.ebIcon_grid3x3_white {
-  background-image: url('../resources/16px/grid3x3_white.svg');
-}
-.ebIcon_grid4x4 {
-  background-image: url('../resources/16px/grid4X4_black_16px.svg');
-}
-.ebIcon_grid4x4_white {
-  background-image: url('../resources/16px/grid4x4_white.svg');
-}
-.ebIcon_gridView {
-  background-image: url('../resources/16px/gridView_black_16px.svg');
-}
-.ebIcon_gridView_white {
-  background-image: url('../resources/16px/gridView_white.svg');
-}
-.ebIcon_jumpTo {
-  background-image: url('../resources/16px/jumpTo_black_16px.svg');
-}
-.ebIcon_microwave {
-  background-image: url('../resources/16px/microwave.svg');
-}
-.ebIcon_mo {
-  background-image: url('../resources/16px/mo.svg');
-}
-.ebIcon_security {
-  background-image: url('../resources/16px/security_black_16px.svg');
-}
-.ebIcon_security_white {
-  background-image: url('../resources/16px/security_white_16px.svg');
-}
-.ebIcon_site {
-  background-image: url('../resources/16px/site_black_16px.svg');
-}
-.ebIcon_siteManager {
-  background-image: url('../resources/16px/siteManager_black_16px.svg');
-}
-.ebIcon_subnetwork {
-  background-image: url('../resources/16px/subnetwork.svg');
-}
-.ebIcon_gateway,
-.ebIcon_switch {
-  background-image: url('../resources/16px/switch.svg');
-}
-.ebIcon_tip {
-  background-image: url('../resources/16px/tip_black_16px.svg');
-}
-.ebIcon_tip_white {
-  background-image: url('../resources/16px/tip_white_16px.svg');
-}
-.ebIcon_attach {
-  background-image: url('../resources/16px/attach_black_16px.svg');
-}
-.ebIcon_attach_white {
-  background-size: contain;
-  background-image: url('../resources/16px/attach_white.svg');
-}
-.ebIcon_clock {
-  background-image: url('../resources/16px/clock_black_16px.svg');
-}
-.ebIcon_clock_white {
-  background-image: url('../resources/16px/clock_white_16px.svg');
-}
-.ebIcon_windowMaximize {
-  background-image: url('../resources/16px/WindowMaximize_black_16px.svg');
-}
-.ebIcon_windowMinimize {
-  background-image: url('../resources/16px/WindowMinimize_black_16px.svg');
-}
-.ebIcon_deprecated {
-  background-image: url('../resources/16px/deprecated_16px.svg');
-}
-.ebIcon_obsolete {
-  background-image: url('../resources/16px/obsolete_16px.svg');
-}
-.ebIcon_newStatus_blue {
-  background-image: url('../resources/16px/newStatus_blue_16px.svg');
-}
-.ebIcon_newStatus_green {
-  background-image: url('../resources/16px/newStatus_green_16px.svg');
-}
-.ebIcon_upload {
-  background-image: url('../resources/16px/upload_black_16px.svg');
-}
-.ebIcon_activate {
-  background-image: url('../resources/16px/activate_black_16px.svg');
-}
-.ebIcon_activate_white {
-  background-size: contain;
-  background-image: url('../resources/16px/activate_white.svg');
-}
-.ebIcon_deactivate {
-  background-image: url('../resources/16px/deactivate_black_16px.svg');
-}
-.ebIcon_deactivate_white {
-  background-size: contain;
-  background-image: url('../resources/16px/deactivate_white.svg');
-}
-.ebIcon_switchBetween {
-  background-image: url('../resources/16px/switchBetween_black_16px.svg');
-}
-.ebIcon_switchBetween_white {
-  background-image: url('../resources/16px/switchBetween_white_16px.svg');
-}
-.ebIcon_eye {
-  background-image: url('../resources/16px/eye_black_16px.svg');
-}
-.ebIcon_eye_white {
-  background-image: url('../resources/16px/eye_white_16px.svg');
-}
-.ebIcon_eyeLine {
-  background-image: url('../resources/16px/eyeLine_black_16px.svg');
-}
-.ebIcon_eyeLine_white {
-  background-image: url('../resources/16px/eyeLine_white.svg');
-}
-.ebIcon_activityTray {
-  background-image: url('../resources/16px/activity_16px_black.svg');
-}
-.ebIcon_note {
-  background-image: url('../resources/16px/note_black_16px.svg');
-  background-size: contain;
-}
-.ebIcon_note_white {
-  background-image: url('../resources/16px/note_white_16px.svg');
-}
-.ebIcon_tableView {
-  background-image: url('../resources/16px/tableView_black_16px.svg');
-}
-.ebIcon_tableView_white {
-  background-image: url('../resources/16px/tableView_white_16px.svg');
-}
-.ebIcon_synced {
-  background-image: url('../resources/16px/Syncd_16px.svg');
-}
-.ebIcon_syncError {
-  background-image: url('../resources/16px/SyncError_16px.svg');
-}
-.ebIcon_syncing {
-  background-image: url('../resources/16px/Syncing_Static_16px.svg');
-}
-.ebIcon_syncing_animated {
-  background-image: url('../resources/16px/Syncing_Animated_16px.svg');
-}
-
-
-/* Breadcrumb */
-.ebBreadcrumbs {
-    position: relative;
-    display: block;
-    font-size: 0;
-    margin-top: 12px;
-    margin-bottom: 4px;
-}
-.ebBreadcrumbs-link {
-    font-size: 1.2rem;
-    vertical-align: middle;
-    display: inline-block
-}
-.ebBreadcrumbs-list {
-    position: absolute;
-    left: 0;
-    margin-top: 6px;
-    display: none;
-    min-width: calc(100% - 16px);
-    max-width: 250px;
-    z-index: 1500
-}
-.ebBreadcrumbs-arrow {
-    margin-left: .6rem;
-    vertical-align: middle;
-    outline: none;
-    display: inline-block;
-    line-height: 12px
-}
-.ebBreadcrumbs-arrow:focus>* {
-    opacity: 1
-}
-.ebBreadcrumbs-arrow_hidden {
-    display: none
-}
-.ebBreadcrumbs-arrow:focus+.ebBreadcrumbs-list {
-    display: block
-}
-.ebBreadcrumbs-item {
-    position: relative;
-    font-size: 0;
-    white-space: nowrap;
-    display: inline-block;
-    margin-bottom: .8rem
-}
-.ebBreadcrumbs-item:after {
-    vertical-align: middle;
-    display: inline-block;
-    width: 20px;
-    content: "/";
-    font-size: 1.6rem;
-    text-align: center;
-    color: #999;
-    cursor: default !important;
-    pointer-events: none !important;
-    -ms-touch-action: none !important;
-    touch-action: none !important;
-    -khtml-user-select: none !important;
-    -moz-user-select: none !important;
-    -o-user-select: none !important;
-    -webkit-user-select: none !important;
-    user-select: none
-}
-.ebBreadcrumbs-item:last-child {
-    margin-right: 0
-}
-.ebBreadcrumbs-item:last-child>.ebBreadcrumbs-link {
-    -ms-touch-action: none !important;
-    touch-action: none !important;
-    -khtml-user-select: none !important;
-    -moz-user-select: none !important;
-    -o-user-select: none !important;
-    -webkit-user-select: none !important;
-    user-select: none
-}
-.ebBreadcrumbs-item:last-child:after {
-    content: "";
-    padding: 0;
-    font-size: 0;
-    width: 0;
-}
-
-.ebBreadcrumbs a {
-    font-size: 1.2rem;
-    color: #0066b3;
-    text-decoration: none;
-}
-.ebBreadcrumbs a:hover {
-    text-decoration: underline;
-    outline: none;
-}
-.ebBreadcrumbs a:active {
-    text-decoration: underline
-}
-.ebBreadcrumbs a:focus {
-    outline: none;
-    text-decoration: underline;
-    box-shadow: none;
-}
-
-.title {
-    padding: 0px;
-}
diff --git a/client/client-editor/src/main/resources/webapp/css/showhideTextarea.css b/client/client-editor/src/main/resources/webapp/css/showhideTextarea.css
deleted file mode 100644
index 9c0f4aed1..000000000
--- a/client/client-editor/src/main/resources/webapp/css/showhideTextarea.css
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/* the div */
-.showHideTextarea{
-}
-
-/* the textarea */
-.showHideTextarea_hidden 
-{
-    display: none;
-    width: 100%;
-    font-size: 15px;
-    height: 300px;
-    box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    border: 1px solid #BEBEBE;
-    padding: 7px;
-    margin: 0px;
-    -webkit-transition: all 0.30s ease-in-out;
-    -moz-transition: all 0.30s ease-in-out;
-    -ms-transition: all 0.30s ease-in-out;
-    -o-transition: all 0.30s ease-in-out;
-    outline: none;
-}
-
-.showHideTextarea_displayed 
-{
-    display: block;
-    width: 100%;
-    font-size: 15px;
-    height: 300px;
-    box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    border: 1px solid #BEBEBE;
-    padding: 7px;
-    margin: 0px;
-    -webkit-transition: all 0.30s ease-in-out;
-    -moz-transition: all 0.30s ease-in-out;
-    -ms-transition: all 0.30s ease-in-out;
-    -o-transition: all 0.30s ease-in-out;
-    outline: none;
-}
-/*
-.showHideTextarea_hidden textarea:focus
-{
-    -moz-box-shadow: 0 0 8px #88D5E9;
-    -webkit-box-shadow: 0 0 8px #88D5E9;
-    box-shadow: 0 0 8px #88D5E9;
-    border: 1px solid #88D5E9;
-}
-
-.showHideTextarea_displayed textarea:focus 
-{
-    -moz-box-shadow: 0 0 8px #88D5E9;
-    -webkit-box-shadow: 0 0 8px #88D5E9;
-    box-shadow: 0 0 8px #88D5E9;
-    border: 1px solid #88D5E9;
-}
-*/
-/* the button - show mode */
-.showHideTextarea_show{
-    display: block;
-    width: 150px;
-    font-size: 15px;
-    background-color: #f6f6f6;
-    font-family: Helvetica, Arial, sans-serif;
-    font-weight: 300;
-    list-style: none;
-    cursor: pointer; 
-    box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    border: 1px solid #BEBEBE;
-    padding: 7px;
-    margin: 0px;
-    -webkit-transition: all 0.30s ease-in-out;
-    -moz-transition: all 0.30s ease-in-out;
-    -ms-transition: all 0.30s ease-in-out;
-    -o-transition: all 0.30s ease-in-out;
-    outline: none;
-}
-
-/* the button - hide mode */
-.showHideTextarea_hide{
-    display: block;
-    width: 150px;
-    font-size: 15px;
-    background-color: #f6f6f6;
-    font-family: Helvetica, Arial, sans-serif;
-    font-weight: 300;
-    list-style: none;
-    cursor: pointer; 
-    box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    border: 1px solid #BEBEBE;
-    padding: 7px;
-    margin: 0px;
-    -webkit-transition: all 0.30s ease-in-out;
-    -moz-transition: all 0.30s ease-in-out;
-    -ms-transition: all 0.30s ease-in-out;
-    -o-transition: all 0.30s ease-in-out;
-    outline: none;
-}
-
-/* the button - disabled */
-.showHideTextarea_show_disabled{
-    display: none;
-}
-
-.showHideTextarea_hide_disabled{
-    display: none;
-}
diff --git a/client/client-editor/src/main/resources/webapp/css/styles.css b/client/client-editor/src/main/resources/webapp/css/styles.css
deleted file mode 100644
index 0a0bb06c9..000000000
--- a/client/client-editor/src/main/resources/webapp/css/styles.css
+++ /dev/null
@@ -1,555 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-.layoutWrapper {
-    margin: 0 40px;
-}
-
-.appHeading {
-    color:rgb(51, 51, 51);
-    display:block;
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    height:32px;
-    line-height:12px;
-    position:relative;
-}
-
-.headerAreaPlaceholder {
-    position: relative;
-    height: 28px;
-    background-color: #E8E8E8;
-    padding-top: 0.4rem;
-    margin: 12px 0px 0px;
-    border-radius: 3px;
-    margin-bottom: -42px;
-    z-index: -1;
-}
-
-.headerArea {
-    top: 50px;
-    padding: 5px 0px 5px;
-    margin: 9px 0px 0px;
-    background-color: #E8E8E8;
-    border-radius: 3px;
-}
-
-.menuArea {
-    float: left;
-}
-
-.mainTabs {
-    position: absolute;
-    top: 20px;
-    bottom: 20px;
-    width: auto;
-    border: solid 1px #CCCCCC;
-}
-
-.mainArea {  
-    padding-bottom: 100px; /*height of footer*/
-}
-
-.footerArea {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 60px;
-    border: 3px solid #73AD21;
-    background-color: powderblue;
-}
-
-.footerArea table {
-    width: auto;
-    border-spacing: 2;
-}
-
-.footerArea td.static {
-    width: 150px;
-    vertical-align: top;
-    padding: 3px 3px 3px 3px;
-}
-
-.footerArea td.scroll {
-    width: 90%;
-    vertical-align: top;
-}
-
-.footerArea table.scroll {
-    width: 100%;
-    border-spacing: 2;
-}
-
-.footerArea table.scroll tbody, .footerArea table.scroll tr {
-    display: block;
-}
-
-.footerArea table.scroll tbody {
-    height: 90px;
-    overflow-y: auto;
-    overflow-x: hidden;
-}
-
-.footerArea table.scroll tbody td {
-    width: auto;
-}
-
-.footerArea table.scroll td {
-    border: solid 1px #CCCCCC;
-}
-
-.footerArea table.scroll thead th:last-child {
-    width: auto;
-}
-
-.footerArea thead tr {
-    height: 60px;
-    line-height: 30px;
-    text-align: left;
-}
-
-.footerArea tbody td:last-child {
-    border-right: none !important;
-}
-
-.edit_area_toggle_checkbox {
-    display: inline-block !important;
-    font-weight: normal !important;
-    font-size: 16px !important;
-}
-
-.newModelFormDiv {
-    background-color: white;
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    width: 600px;
-    height: 420px;
-    resize: both;
-    overflow: auto;
-    padding: 10px 10px 10px 10px;
-    border: 1px solid #c0c0c0;
-    border-radius: 3px;
-    box-shadow: 0 3px 6px #999999;
-}
-
-.newModelFormDiv .headingSpan {
-    width: 100%;
-    height: 30px;
-    display: inline-block;
-    text-align: center;
-    font-weight: bold;
-    font-size: 20px;
-    padding: 5px 0px 0px 0px;
-    border-bottom: #c0c0c0 solid 1px;
-}
-
-.newModelDivBackground {
-    position: fixed;
-    height: 100%;
-    width: 100%;
-    background-color: rgba(0,0,0,0.5);
-    top: 0px;
-    left: 0px;
-}
-
-.resultFormDiv {
-    background-color: white;
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    width: 600px;
-    height: 620px;
-    resize: both;
-    overflow: auto;
-    padding: 10px 10px 10px 10px;
-    border: 1px solid #c0c0c0;
-    border-radius: 3px;
-    box-shadow: 0 3px 6px #999999;
-}
-
-.resultFormDiv .headingSpan {
-    width: 100%;
-    height: 30px;
-    display: inline-block;
-    text-align: center;
-    font-weight: bold;
-    font-size: 20px;
-    padding: 5px 0px 0px 0px;
-    border-bottom: #c0c0c0 solid 1px;
-}
-
-.resultFormDiv .okButton {
-    font-size: 15px;
-    float: right;
-}
-
-.resultFormDiv .form-style-1 .field-textarea {
-    height: 500px;
-    font-size: 15px;
-}
-
-
-.form-style-1 {
-    margin: 10px auto;
-    font: 16px "Lucida Sans Unicode", "Lucida Grande", sans-serif;
-}
-
-.form-style-1 li {
-    padding: 0;
-    display: block;
-    list-style: none;
-    margin: 10px 0 0 0;
-}
-
-.form-style-1 label {
-    margin: 0 0 3px 0;
-    padding: 0px;
-    display: block;
-    font-weight: bold;
-}
-
-.form-style-1 input[type=text], .form-style-1 input[type=date],
-    .form-style-1 input[type=datetime], .form-style-1 input[type=number],
-    .form-style-1 input[type=search], .form-style-1 input[type=time],
-    .form-style-1 input[type=url], .form-style-1 input[type=email],
-    textarea, select {
-    box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    border: 1px solid #BEBEBE;
-    padding: 0px 7px;
-    margin: 0px;
-    -webkit-transition: all 0.30s ease-in-out;
-    -moz-transition: all 0.30s ease-in-out;
-    -ms-transition: all 0.30s ease-in-out;
-    -o-transition: all 0.30s ease-in-out;
-    outline: none;
-}
-
-.form-style-1 input[type=text]:focus, .form-style-1 input[type=date]:focus,
-    .form-style-1 input[type=datetime]:focus, .form-style-1 input[type=number]:focus,
-    .form-style-1 input[type=search]:focus, .form-style-1 input[type=time]:focus,
-    .form-style-1 input[type=url]:focus, .form-style-1 input[type=email]:focus,
-    .form-style-1 textarea:focus, .form-style-1 select:focus {
-    -moz-box-shadow: 0 0 8px #88D5E9;
-    -webkit-box-shadow: 0 0 8px #88D5E9;
-    box-shadow: 0 0 8px #88D5E9;
-    border: 1px solid #88D5E9;
-}
-.form-style-1 input:focus::-webkit-input-placeholder { color:transparent; }
-.form-style-1 input:focus:-moz-placeholder { color:transparent; }
-
-.form-style-1 .field {
-    font-size: 15px;
-}
-
-.form-style-1 .field-divided {
-    width: 49%;
-    font-size: 15px;
-}
-
-.form-style-1 .field-long {
-    width: 100%;
-    font-size: 15px;
-}
-
-.form-style-1 .field-medium {
-    width: 50%;
-    font-size: 15px;
-}
-
-.form-style-1 .field-select {
-    width: 100%;
-    font-size: 15px;
-}
-
-.form-style-1 .field-textarea {
-    height: 100px;
-    font-size: 15px;
-}
-
-.form-style-1 .field-javaType{
-    width: 100%;
-    font-size: 15px;
-}
-
-.form-style-1 .field-schemaFlavour{
-    width: 100%;
-    font-size: 15px;
-}
-
-.form-style-1 .field-taskSelLogic{
-    width: 100%;
-    font-size: 15px;
-    height: 300px;
-}
-
-.form-style-1 .field-taskLogic{
-    width: 100%;
-    font-size: 15px;
-    height: 300px;
-}
-
-.form-style-1 .field-finalizerLogic{
-    width: 100%;
-    font-size: 15px;
-    height: 300px;
-}
-
-.form-style-1 .field-schemaDefinition{
-    width: 100%;
-    font-size: 15px;
-    height: 100px;
-}
-
-.form-style-1 .required {
-    color: red;
-}
-
-.form-style-1 .button {
-    font-size: 15px;
-}
-
-.form-style-1 .delete_ex {
-  height: 30px;
-  width: 30px;
-  opacity: 1;
-  font-size: 30px;
-  line-height: 30px;
-  transition: all 0.8s;
-  border: 1px solid transparent;
-  text-align: center;
-}
-.form-style-1 .delete_ex:hover {
-  border-radius: 50%;
-  background: tomato;
-  border: 1px solid black;
-}
-.form-style-1 .delete_ex_disabled {
-  width: 0px;
-  opacity: 0;
-}
-
-
-
-.hideable_div_hidden 
-{
-    display: none;
-}
-
-.hideable_div_displayed 
-{
-    display: block;
-}
-
-
-
-/* the textarea */
-.hideable_Textarea_hidden 
-{
-    display: none;
-}
-
-.hideable_Textarea_displayed 
-{
-    display: block;
-    width: 100%;
-    height: 300px;
-}
-
-.hideable_Textarea_hidden textarea:focus
-{
-    -moz-box-shadow: 0 0 8px #88D5E9;
-    -webkit-box-shadow: 0 0 8px #88D5E9;
-    box-shadow: 0 0 8px #88D5E9;
-    border: 1px solid #88D5E9;
-}
-
-.hideable_Textarea_displayed textarea:focus 
-{
-    -moz-box-shadow: 0 0 8px #88D5E9;
-    -webkit-box-shadow: 0 0 8px #88D5E9;
-    box-shadow: 0 0 8px #88D5E9;
-    border: 1px solid #88D5E9;
-}
-
-/* the button - show mode */
-.showhide_button_show{
-    display: block;
-    width: 150px;
-    font-size: 15px;
-    background-color: #f6f6f6;
-    font-family: Helvetica, Arial, sans-serif;
-    font-weight: 300;
-    list-style: none;
-    cursor: pointer; 
-    box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    border: 1px solid #BEBEBE;
-    padding: 7px;
-    margin: 0px;
-    -webkit-transition: all 0.30s ease-in-out;
-    -moz-transition: all 0.30s ease-in-out;
-    -ms-transition: all 0.30s ease-in-out;
-    -o-transition: all 0.30s ease-in-out;
-    outline: none;
-}
-
-/* the button - hide mode */
-.showhide_button_hide{
-    display: block;
-    width: 150px;
-    font-size: 15px;
-    background-color: #f6f6f6;
-    font-family: Helvetica, Arial, sans-serif;
-    font-weight: 300;
-    list-style: none;
-    cursor: pointer; 
-    box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    border: 1px solid #BEBEBE;
-    padding: 7px;
-    margin: 0px;
-    -webkit-transition: all 0.30s ease-in-out;
-    -moz-transition: all 0.30s ease-in-out;
-    -ms-transition: all 0.30s ease-in-out;
-    -o-transition: all 0.30s ease-in-out;
-    outline: none;
-}
-
-.showhide_div_hide{
-    display: none;
-}
-
-.showhide_div_show{
-    display: block;
-}
-
-.add-field {
-    display: inline-block;
-    cursor: pointer;
-    margin-left: 1px;
-}
-
-.form-add-icon, .form-add-text {
-    display: inline-block;
-    vertical-align: middle;
-}
-
-.form-add-text {
-    margin-left: 8px;
-}
-
-.form-heading {
-    text-align: start;
-}
-
-.ui-tabs-tab-custom {
-    border-radius: 5px 5px 0px 0px;
-}
-
-.ui-tabs-active-custom {
-    border: 1px solid #ccc !important;
-    border-width: 1px 0 0 1px !important;
-    background-image: none !important;
-    background-color: #fff !important;
-    border-bottom-color: transparent !important;
-    cursor: default !important;
-}
-
-.ui-tabs-anchor-custom {
-    color: #454545 !important;
-}
-
-input:disabled {
-    background-color: #FF0000;
-}
-
-.modelTagArea {
-    height: 24px;
-}
-
-.modelTag {
-    display: none;    
-}
-
-.field-add-new {
-    display: none;
-}
-
-.field-checkbox-center {
-    text-align: center;
-    vertical-align: middle;
-}
-
-.placeholder {
-    text-align: center;
-    white-space: nowrap;
-}
-
-.onapLogo {
-    padding-right: 100px;
-    height: 75px;
-    width: 350px;
-}
-
-.apexLogo {
-    height: 267px;
-    width: 350px;
-}
-
-.ui-tabs-panel {
-    overflow-x: auto;
-}
-
-.periodic-events-checkbox {
-    margin-left: 12px;
-}
-
-.periodic-events-label {
-    display: inline-block !important;
-    font-weight: normal !important;
-    font: 14px Lucida Sans Unicode, Lucida Grande, sans-serif !important; 
-}
-
-.policy-trigger-event {
-    display: inline-block !important;
-    font-weight: normal !important;
-}
-
-input:focus::-webkit-input-placeholder { color:transparent; }
-input:focus:-moz-placeholder { color:transparent; } /* Firefox 18- */
-input:focus::-moz-placeholder { color:transparent; } /* Firefox 19+ */
-input:focus:-ms-input-placeholder { color:transparent; } /* IE */
-
-textarea:focus::-webkit-input-placeholder { color:transparent; }
-textarea:focus:-moz-placeholder { color:transparent; } /* Firefox 18- */
-textarea:focus::-moz-placeholder { color:transparent; } /* Firefox 19+ */
-textarea:focus:-ms-input-placeholder { color:transparent; } /* IE */
-
-.title {
-    padding: 0px;
-}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/images/Apex.png b/client/client-editor/src/main/resources/webapp/images/Apex.png
deleted file mode 100644
index e71451fee..000000000
--- a/client/client-editor/src/main/resources/webapp/images/Apex.png
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/images/logo_onap.png b/client/client-editor/src/main/resources/webapp/images/logo_onap.png
deleted file mode 100644
index c6f6857a5..000000000
--- a/client/client-editor/src/main/resources/webapp/images/logo_onap.png
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/index.html b/client/client-editor/src/main/resources/webapp/index.html
deleted file mode 100644
index e03018de7..000000000
--- a/client/client-editor/src/main/resources/webapp/index.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2016-2018 Ericsson. All rights reserved.
-  ================================================================================
-  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.
-  
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<html>
-<head>
-<meta charset="UTF-8">
-
-<title>Apex Policy Editor</title>
-
-<!-- Apex style -->
-<link rel="stylesheet" type="text/css" href="css/styles.css" />
-
-<!-- fileMenu style -->
-<link rel="stylesheet" type="text/css" href="css/fileMenu.css">
-
-<!-- contextMenu style -->
-<link rel="stylesheet" type="text/css" href="css/contextMenu.css">
-
-<!-- dropdownList style -->
-<link rel="stylesheet" type="text/css" href="css/dropdownList.css">
-
-<!-- showhideTextarea style -->
-<link rel="stylesheet" type="text/css" href="css/showhideTextarea.css">
-
-<!-- interface style -->
-<link rel="stylesheet" type="text/css" href="css/interfaceAssets.css">
-
-<!-- JQuery style -->
-<link rel="stylesheet" href="js/jquery-ui-1.12.1/jquery-ui.css">
-
-<script type="text/javascript" src="js/ApexUtils.js"></script>
-
-</head>
-
-<body>
-    <div class="ebSystemBar">
-        <div class="ebSystemBar-topMenuName">Apex</div>
-    </div>
-
-    <div class="layoutWrapper">
-
-        <div class="ebBreadcrumbs">
-            <div class="ebBreadcrumbs-item">
-                <a href="javascript:getHomepageURL();" class="ebBreadcrumbs-link">Apex</a>
-            </div>
-            <div class="ebBreadcrumbs-item">
-                <a href="" class="ebBreadcrumbs-link">Policy Editor</a>
-            </div>
-        </div>
-
-        <div class="appHeading">
-            <h1 class="title">Apex Policy Editor</h1>
-        </div>
-
-        <div class="headerAreaPlaceholder"></div>
-
-
-        <div class="content" style="display: none;">
-            <div class="headerArea">
-                <div class="menuArea">
-                    <ul id="menu">
-                        <li id="menuFile" class="fileMenuButton">File
-                            <ul>
-                                <li id="menuFileNew">New <kbd>Ctrl+N</kbd></li>
-                                <li id="menuFileOpen">Open... <kbd>Ctrl+O</kbd></li>
-                                <li id="menuFileDownload">Download <kbd>Ctrl+S</kbd></li>
-                                <li id="menuFileClear">Clear<kbd>Ctrl+D</kbd></li>
-                                <li class="divider"></li>
-                                <li id="menuFileNewSession">New Session<kbd>Ctrl+R</kbd></li>
-                                <li id="menuFileClose">Close <kbd>Ctrl+Q</kbd></li>
-                            </ul>
-                        </li>
-                        <li id="menuModel" class="fileMenuButton">Model
-                            <ul>
-                                <li id="menuModelAnalyse">Analyse <kbd>Ctrl+A</kbd></li>
-                                <li id="menuModelValidate">Validate <kbd>Ctrl+V</kbd></li>
-                                <li id="menuModelCompare">Compare...</li>
-                                <li id="menuModelSplit">Split...</li>
-                                <li id="menuModelMerge">Merge...</li>
-                            </ul>
-                        </li>
-                        <li id="menuConcept" class="fileMenuButton">Concepts
-                            <ul>
-                                <li id="menuConceptsContextSchemas">Context Item Schemas</li>
-                                <li id="menuConceptsEvents">Events</li>
-                                <li id="menuConceptsContextAlbums">Context Albums</li>
-                                <li id="menuConceptsTasks">Tasks</li>
-                                <li id="menuConceptsPolicies">Policies</li>
-                                <li id="menuConceptsKeyInformation">Key Information</li>
-                            </ul>
-                        </li>
-                        <li id="menuHelp" class="fileMenuButton">Help
-                            <ul>
-                                <li id="menuHelpAbout">About<kbd>F1</kbd></li>
-                            </ul>
-                        </li>
-                        <div class="fileMenuSeperator"></div>
-                    </ul>
-
-                </div>
-                <div class="modelTagArea">
-                    <table class="modelTag">
-                        <tr>
-                            <td id="modelNameLabel" class="modelNameLabel">Model Name:</td>
-                            <td>&nbsp;</td>
-                            <td id="modelName" class="modelName">N/A</td>
-                            <td>&nbsp;</td>
-                            <td id="modelVersionLabel" class="modelVersionLabel">Version:</td>
-                            <td>&nbsp;</td>
-                            <td id="modelVersion" class="modelVersion">N/A</td>
-                            <td>&nbsp;</td>
-                            <td id="modelFileNameLable" class="modelFileNameLabel">File
-                                Name:</td>
-                            <td>&nbsp;</td>
-                            <td id="modelFileName" class="modelFileName">N/A</td>
-                        </tr>
-                    </table>
-                </div>
-
-            </div>
-
-            <div id="mainArea" class="mainArea">
-                <div id="mainTabs" class="mainTabs">
-                    <ul>
-                        <li><a href="#contextSchemasTab">Context Item Schemas</a></li>
-                        <li><a href="#eventsTab">Events</a></li>
-                        <li><a href="#contextAlbumsTab">Context Albums</a></li>
-                        <li><a href="#tasksTab">Tasks</a></li>
-                        <li><a href="#policiesTab">Policies</a></li>
-                        <li><a href="#keyInformationTab">Key Information</a></li>
-                    </ul>
-
-                    <div id="contextSchemasTab">
-                        <!--  Dynamically created form goes here-->
-                    </div>
-
-                    <div id="eventsTab">
-                        <!--  Dynamically created form goes here-->
-                    </div>
-
-                    <div id="contextAlbumsTab">
-                        <!--  Dynamically created form goes here-->
-                    </div>
-
-                    <div id="tasksTab">
-                        <!--  Dynamically created form goes here-->
-                    </div>
-
-                    <div id="policiesTab">
-                        <!--  Dynamically created form goes here-->
-                    </div>
-
-                    <div id="keyInformationTab">
-                        <!--  Dynamically created form goes here-->
-                    </div>
-                </div>
-            </div>
-
-            <div class="placeholder">
-                <!--  Placeholder for when no policy has been loaded yet -->
-                <img class="onapLogo placeholderLogo" src="images/logo_onap.png"
-                    alt="ONAP"> <img class="apexLogo placeholderLogo"
-                    src="images/Apex.png" alt="Apex">
-            </div>
-
-            <div class="ebInlineMessage">
-                <div class="ebInlineMessage-iconHolder">
-                    <i id="ebInlineMessage-iconHolder-icon" class="ebIcon ebIcon_big"></i>
-                </div>
-                <div class="ebInlineMessage-contentHolder">
-                    <div class="ebInlineMessage-header" id="statusString"></div>
-                    <div class="ebInlineMessage-separator"></div>
-                    <div class="ebInlineMessage-description" id="statusMessageTable"></div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- jQuery -->
-    <script src="jquery/jquery-3.4.1.min.js"></script>
-    <script src="js/jquery-ui-1.12.1/jquery-ui.js"></script>
-
-    <!-- fileMenu JS file -->
-    <script type="text/javascript" src="js/fileMenu.js"></script>
-
-    <!-- contextMenu JS file -->
-    <script type="text/javascript" src="js/contextMenu.js"></script>
-    <!-- dropdownList JS file -->
-    <script type="text/javascript" src="js/dropdownList.js"></script>
-    <!-- showHideTextarea JS file -->
-    <script type="text/javascript" src="js/showhideTextarea.js"></script>
-    <!-- showhideElement JS file -->
-    <script type="text/javascript" src="js/showhideElement.js"></script>
-    <!--  edit area JS file -->
-    <script language="javascript" type="text/javascript"
-        src="js/edit_area/edit_area_full.js"></script>
-
-    <!-- Apex JS files -->
-    <script type="text/javascript" src="js/ApexTable.js"></script>
-    <script type="text/javascript" src="js/ApexContextSchemaTab.js"></script>
-    <script type="text/javascript" src="js/ApexContextSchemaEditForm.js"></script>
-    <script type="text/javascript" src="js/ApexEventTab.js"></script>
-    <script type="text/javascript" src="js/ApexEventEditForm.js"></script>
-    <script type="text/javascript" src="js/ApexContextAlbumTab.js"></script>
-    <script type="text/javascript" src="js/ApexContextAlbumEditForm.js"></script>
-    <script type="text/javascript" src="js/ApexTaskTab.js"></script>
-    <script type="text/javascript" src="js/ApexTaskEditForm.js"></script>
-    <script type="text/javascript" src="js/ApexPolicyTab.js"></script>
-    <script type="text/javascript" src="js/ApexPolicyEditForm_State.js"></script>
-    <script type="text/javascript" src="js/ApexPolicyEditForm.js"></script>
-    <script type="text/javascript" src="js/ApexKeyInformationTab.js"></script>
-    <script type="text/javascript" src="js/ApexAjax.js"></script>
-    <script type="text/javascript" src="js/ApexPageControl.js"></script>
-    <script type="text/javascript" src="js/ApexFiles.js"></script>
-    <script type="text/javascript" src="js/ApexFormUtils.js"></script>
-    <script type="text/javascript" src="js/ApexNewModelForm.js"></script>
-    <script type="text/javascript" src="js/ApexResultForm.js"></script>
-    <script type="text/javascript" src="js/ApexModelHandling.js"></script>
-    <script type="text/javascript" src="js/ApexMain.js"></script>
-
-</body>
-</html>
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexAjax.js b/client/client-editor/src/main/resources/webapp/js/ApexAjax.js
deleted file mode 100644
index c241a4459..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexAjax.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function ajax_get(requestURL, callback) {
-    $.ajax({
-        type : 'GET',
-        url : requestURL,
-        dataType : "json", // data type of response
-        success : function(data, textStatus, jqXHR) {
-            pageControl_successStatus(data);
-            callback(data);
-        },
-        error : function(jqXHR, textStatus, errorThrown) {
-            pageControl_restError(requestURL, jqXHR, textStatus, errorThrown);
-        }
-    });
-}
-
-function ajax_getWithKeyInfo(requestURL, objectType, callback, keyName) {
-    var keyName = keyName || "key";
-    var keyInfoURL = restRootURL + "/KeyInformation/Get?name=&version=";
-    ajax_get(keyInfoURL, function(dataKeyInfos) {
-        ajax_get(requestURL, function(data) {
-            var keyInfos = [];
-            for ( var i = 0; i < dataKeyInfos.messages.message.length; i++) {
-                var ki = JSON.parse(dataKeyInfos.messages.message[i]).apexKeyInfo;
-                keyInfos.push(ki);
-            }
-            var object = JSON.parse(data.messages.message[0])[objectType];
-            var keyInfo = keyInfos.filter(function(ki) {
-                return ki.key.name === object[keyName].name
-                    && ki.key.version === object[keyName].version;
-            });
-            if (keyInfo.length > 0) {
-                object.uuid = keyInfo[0].UUID;
-                object.description = keyInfo[0].description;
-            }
-            callback(object);
-        });
-    });
-}
-
-function ajax_getOKOrFail(requestURL, callback) {
-    $.ajax({
-        type : 'GET',
-        url : requestURL,
-        dataType : "json", // data type of response
-        success : function(data, textStatus, jqXHR) {
-            pageControl_status(data);
-            callback(data);
-        },
-        error : function(jqXHR, textStatus, errorThrown) {
-            pageControl_restError(requestURL, jqXHR, textStatus, errorThrown);
-        }
-    });
-}
-
-function ajax_put(requestURL, requestData, callback) {
-    $.ajax({
-        type : 'PUT',
-        contentType : 'application/json',
-        url : requestURL,
-        dataType : "json",
-        data : requestData,
-        success : function(responseData, textStatus, jqXHR) {
-            pageControl_successStatus(responseData);
-            callback(responseData);
-        },
-        error : function(jqXHR, textStatus, errorThrown) {
-            pageControl_restError(requestURL, jqXHR, textStatus, errorThrown);
-        }
-    });
-}
-
-function ajax_post(requestURL, requestData, callback) {
-    $.ajax({
-        type : 'POST',
-        contentType : 'application/json',
-        url : requestURL,
-        dataType : "json",
-        data : requestData,
-        success : function(responseData, textStatus, jqXHR) {
-            pageControl_successStatus(responseData);
-            callback(responseData);
-        },
-        error : function(jqXHR, textStatus, errorThrown) {
-            pageControl_restError(requestURL, jqXHR, textStatus, errorThrown);
-        }
-    });
-}
-
-function ajax_delete(requestURL, callback) {
-    $.ajax({
-        type : 'DELETE',
-        url : requestURL,
-        dataType : "json", // data type of response
-        success : function(data, textStatus, jqXHR) {
-            pageControl_successStatus(data);
-            callback(data);
-        },
-        error : function(jqXHR, textStatus, errorThrown) {
-            pageControl_restError(requestURL, jqXHR, textStatus, errorThrown);
-        }
-    });
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumEditForm.js b/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumEditForm.js
deleted file mode 100644
index 602fa4908..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumEditForm.js
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function editContextAlbumForm_createContextAlbum(formParent) {
-    // Get all contextSchemas too for album item schema
-    var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
-    var contextSchemas = new Array();
-    ajax_get(requestURL, function(data2) {
-        for (var i = 0; i < data2.messages.message.length; i++) {
-            var contextSchema = JSON.parse(data2.messages.message[i]).apexContextSchema;
-            contextSchemas.push({
-                "name" : contextSchema.key.name,
-                "version" : contextSchema.key.version,
-                "displaytext" : contextSchema.key.name + ":" + contextSchema.key.version,
-                "contextSchema" : contextSchema
-            });
-        }
-        editContextAlbumForm_activate(formParent, "CREATE", null, contextSchemas);
-    });
-}
-
-function editContextAlbumForm_deleteContextAlbum(parent, name, version) {
-    var message = "Are you sure you want to delete ContextAlbum \"" + name + ":" + version + "\"?";
-    if (apexUtils_areYouSure(message)) {
-        var requestURL = restRootURL + "/ContextAlbum/Delete?name=" + name + "&version=" + version;
-        ajax_delete(requestURL, function(data) {
-            apexUtils_removeElement("editContextAlbumFormDiv");
-            contextAlbumTab_reset();
-            keyInformationTab_reset()
-        });
-    }
-}
-
-function editContextAlbumForm_viewContextAlbum(parent, name, version) {
-    var requestURL = restRootURL + "/ContextAlbum/Get?name=" + name + "&version=" + version;
-    ajax_getWithKeyInfo(requestURL, "apexContextAlbum", function(contextAlbum) {
-        // Get all contextSchemas too for album item schema
-        var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
-        var contextSchemas = new Array();
-        ajax_get(requestURL, function(data2) {
-            for (var i = 0; i < data2.messages.message.length; i++) {
-                var contextSchema = JSON.parse(data2.messages.message[i]).apexContextSchema;
-                contextSchemas.push({
-                    "name" : contextSchema.key.name,
-                    "version" : contextSchema.key.version,
-                    "displaytext" : contextSchema.key.name + ":" + contextSchema.key.version,
-                    "contextSchema" : contextSchema
-                });
-            }
-            editContextAlbumForm_activate(parent, "VIEW", contextAlbum, contextSchemas);
-        });
-    });
-}
-
-function editContextAlbumForm_editContextAlbum(formParent, name, version) {
-    var requestURL = restRootURL + "/ContextAlbum/Get?name=" + name + "&version=" + version;
-    ajax_getWithKeyInfo(requestURL, "apexContextAlbum", function(contextAlbum) {
-        // Get all contextSchemas too for album item schema
-        var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
-        var contextSchemas = new Array();
-        ajax_get(requestURL, function(data2) {
-            for (var i = 0; i < data2.messages.message.length; i++) {
-                var contextSchema = JSON.parse(data2.messages.message[i]).apexContextSchema;
-                contextSchemas.push({
-                    "name" : contextSchema.key.name,
-                    "version" : contextSchema.key.version,
-                    "displaytext" : contextSchema.key.name + ":" + contextSchema.key.version,
-                    "contextSchema" : contextSchema
-                });
-            }
-            editContextAlbumForm_activate(formParent, "EDIT", contextAlbum, contextSchemas);
-        });
-    });
-}
-
-function editContextAlbumForm_activate(parent, operation, contextAlbum, contextSchemas) {
-    apexUtils_removeElement("editContextAlbumFormDiv");
-    var formParent = document.getElementById(parent);
-    apexUtils_emptyElement(parent);
-
-    var isedit = false;
-    var createEditOrView = "";
-
-    if (!operation) {
-        console.warn("No operation specified for ContextAlbumForm form")
-    } else {
-        createEditOrView = operation.toUpperCase();
-    }
-
-    if (createEditOrView == "CREATE") {
-        isedit = true;
-    } else if (createEditOrView == "EDIT" || createEditOrView == "VIEW") {
-        if (createEditOrView == "EDIT") {
-            isedit = true;
-        }
-
-        if (!contextAlbum) {
-            console.warn("Invalid value (\"" + contextAlbum
-                    + "\") passed as a value for \"contextAlbum\" for ContextAlbumForm form.");
-        } else {
-            if (!contextAlbum.key || !contextAlbum.key.name || contextAlbum.key.name == "") {
-                console.warn("Invalid value (\"" + contextAlbum.key.name
-                        + "\") passed as a value for \"name\" for ContextAlbumForm form.");
-            }
-            if (!contextAlbum.key || !contextAlbum.key.version || contextAlbum.key.version == "") {
-                console.warn("Invalid value (\"" + contextAlbum.key.version
-                        + "\") passed as a value for \"version\" for ContextAlbumForm form.");
-            }
-            if (!contextAlbum.uuid || contextAlbum.uuid == "") {
-                console.warn("Invalid value (\"" + contextAlbum.uuid
-                        + "\") passed as a value for \"uuid\" for ContextAlbumForm form.");
-            }
-            if (createEditOrView == "VIEW") {
-                if (!contextAlbum.description) {
-                    console.warn("Invalid value (\"" + contextAlbum.description
-                            + "\") passed as a value for \"description\" for ContextAlbumForm form.");
-                }
-                if (!contextAlbum.scope || contextAlbum.scope == "") {
-                    console.warn("Invalid value (\"" + contextAlbum.scope
-                            + "\") passed as a value for \"scope\" for ContextAlbumForm form.");
-                }
-                if (!contextAlbum.itemSchema || !contextAlbum.itemSchema.name || contextAlbum.itemSchema.name == ""
-                        || !contextAlbum.itemSchema.version || contextAlbum.itemSchema.version == "") {
-                    console.warn("Invalid value (\"" + contextAlbum.itemSchema
-                            + "\") passed as a value for \"itemSchema\" for ContextAlbumForm form.");
-                }
-                if (!contextAlbum.isWritable || contextAlbum.isWritable == "") {
-                    console.warn("Invalid value (\"" + contextAlbum.isWritable
-                            + "\") passed as a value for \"isWritable\" for ContextAlbumForm form.");
-                }
-            }
-        }
-    } else {
-        console
-                .warn("Invalid operation (\""
-                        + operation
-                        + "\") specified for ContextAlbumForm form. Only \"Create\", \"Edit\" and \"View\" operations are supported");
-    }
-
-    var contentelement = document.createElement("editContextAlbumFormDiv");
-    var formDiv = document.createElement("div");
-    contentelement.appendChild(formDiv);
-    formDiv.setAttribute("id", "editContextAlbumFormDiv");
-    formDiv.setAttribute("class", "editContextAlbumFormDiv");
-
-    var headingSpan = document.createElement("h2");
-    formDiv.appendChild(headingSpan);
-    headingSpan.innerHTML = "Context Item Album Editor";
-
-    var form = document.createElement("editContextAlbumForm");
-    formDiv.appendChild(form);
-
-    form.setAttribute("id", "editContextAlbumForm");
-    form.setAttribute("class", "form-style-1");
-    form.setAttribute("method", "post");
-    form.setAttribute("createEditOrView", createEditOrView);
-
-    var formul = document.createElement("ul");
-    form.appendChild(formul);
-
-    var nameLI = document.createElement("li");
-    formul.appendChild(nameLI);
-    var nameLabel = document.createElement("label");
-    nameLI.appendChild(nameLabel);
-    nameLabel.setAttribute("for", "editContextAlbumFormNameInput");
-    nameLabel.innerHTML = "Name: ";
-    var nameLabelSpan = document.createElement("span");
-    nameLabel.appendChild(nameLabelSpan);
-    nameLabelSpan.setAttribute("class", "required");
-    nameLabelSpan.innerHTML = "*";
-    var nameInput = document.createElement("input");
-    nameLI.appendChild(nameInput);
-    nameInput.setAttribute("id", "editContextAlbumFormNameInput");
-    nameInput.setAttribute("type", "text");
-    nameInput.setAttribute("name", "editContextAlbumFormameInput");
-    nameInput.setAttribute("class", "field ebInput");
-    nameInput.setAttribute("placeholder", "name");
-    if (contextAlbum && contextAlbum.key && contextAlbum.key.name) {
-        nameInput.value = contextAlbum.key.name;
-    }
-    if (createEditOrView != "CREATE") {
-        nameInput.readOnly = true;
-    }
-
-    var versionLI = document.createElement("li");
-    formul.appendChild(versionLI);
-    var versionLabel = document.createElement("label");
-    versionLI.appendChild(versionLabel);
-    versionLabel.setAttribute("for", "editContextAlbumFormVersionInput");
-    versionLabel.innerHTML = "Version: ";
-    var versionInput = document.createElement("input");
-    versionLI.appendChild(versionInput);
-    versionInput.setAttribute("id", "editContextAlbumFormVersionInput");
-    versionInput.setAttribute("type", "text");
-    versionInput.setAttribute("name", "editContextAlbumFormVersionInput");
-    versionInput.setAttribute("class", "field ebInput");
-    versionInput.setAttribute("placeholder", "0.0.1");
-    if (contextAlbum && contextAlbum.key && contextAlbum.key.version) {
-        versionInput.value = contextAlbum.key.version;
-    }
-    if (createEditOrView != "CREATE") {
-        versionInput.readOnly = true;
-    }
-
-    var uuidLI = document.createElement("li");
-    formul.appendChild(uuidLI);
-    var uuidLabel = document.createElement("label");
-    uuidLI.appendChild(uuidLabel);
-    uuidLabel.setAttribute("for", "editContextAlbumFormUuidInput");
-    uuidLabel.innerHTML = "UUID: ";
-    var uuidInput = document.createElement("input");
-    uuidLI.appendChild(uuidInput);
-    uuidInput.setAttribute("id", "editContextAlbumFormUuidInput");
-    uuidInput.setAttribute("type", "text");
-    uuidInput.setAttribute("name", "editContextAlbumFormUuidInput");
-    uuidInput.setAttribute("class", "field-long  ebInput ebInput_width_full");
-    uuidInput.setAttribute("placeholder", "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
-    if (contextAlbum && contextAlbum.uuid) {
-        uuidInput.value = contextAlbum.uuid;
-    }
-    if (createEditOrView != "CREATE") {
-        uuidInput.readOnly = true;
-    }
-
-    var disabled = (createEditOrView != "CREATE" && createEditOrView != "EDIT");
-
-    var descriptionLI = document.createElement("li");
-    formul.appendChild(descriptionLI);
-    var descriptionLabel = document.createElement("label");
-    descriptionLI.appendChild(descriptionLabel);
-    descriptionLabel.setAttribute("for", "editContextAlbumFormDescriptionTextArea");
-    descriptionLabel.innerHTML = "Description: ";
-    var descriptionTextArea = document.createElement("textarea");
-    descriptionLI.appendChild(descriptionTextArea);
-    descriptionTextArea.setAttribute("id", "editContextAlbumFormDescriptionTextArea");
-    descriptionTextArea.setAttribute("name", "editContextAlbumFormDescriptionTextArea");
-    descriptionTextArea.setAttribute("class", "field-long field-textarea  ebTextArea ebTextArea_width_full");
-    if (contextAlbum && contextAlbum.description) {
-        descriptionTextArea.value = contextAlbum.description;
-    }
-    descriptionTextArea.readOnly = disabled;
-
-    var albumScopeLI = document.createElement("li");
-    formul.appendChild(albumScopeLI);
-    var albumScopeLabel = document.createElement("label");
-    albumScopeLI.appendChild(albumScopeLabel);
-    albumScopeLabel.setAttribute("for", "editContextAlbumFormAlbumScopeInput");
-    albumScopeLabel.innerHTML = "Context Album Scope: ";
-    var albumScopeInput = document.createElement("input");
-    albumScopeLI.appendChild(albumScopeInput);
-    albumScopeInput.setAttribute("id", "editContextAlbumFormAlbumScopeInput");
-    albumScopeInput.setAttribute("type", "text");
-    albumScopeInput.setAttribute("name", "editContextAlbumFormAlbumScopeInput");
-    albumScopeInput.setAttribute("class", "field-albumScope ebInput");
-    albumScopeInput.setAttribute("placeholder", "Global");
-    if (contextAlbum && contextAlbum.scope) {
-        albumScopeInput.value = contextAlbum.scope;
-    }
-    albumScopeInput.readOnly = disabled;
-
-    var albumReadOnlyLI = document.createElement("li");
-    formul.appendChild(albumReadOnlyLI);
-    var albumReadOnlyLabel = document.createElement("label");
-    albumReadOnlyLI.appendChild(albumReadOnlyLabel);
-    albumReadOnlyLabel.setAttribute("for", "editContextAlbumFormAlbumReadOnlyInput");
-    albumReadOnlyLabel.innerHTML = "Read Only? ";
-    var albumReadOnlyInput = document.createElement("input");
-    albumReadOnlyInput.setAttribute("type", "checkbox");
-    albumReadOnlyLI.appendChild(albumReadOnlyInput);
-    albumReadOnlyInput.setAttribute("id", "editContextAlbumFormAlbumReadOnlyCheckbox");
-    albumReadOnlyInput.setAttribute("name", "editContextAlbumFormAlbumReadOnlyCheckbox");
-    albumReadOnlyInput.setAttribute("class", "field-albumReadonlyCheckbox");
-    if (contextAlbum && contextAlbum.isWritable != null && contextAlbum.isWritable === false) {
-        albumReadOnlyInput.checked = true;
-    } else {
-        albumReadOnlyInput.checked = false;
-    }
-    albumReadOnlyInput.disabled = disabled;
-
-    var albumItemSchemaLI = document.createElement("li");
-    formul.appendChild(albumItemSchemaLI);
-    var albumItemSchemaLabel = document.createElement("label");
-    albumItemSchemaLI.appendChild(albumItemSchemaLabel);
-    albumItemSchemaLabel.setAttribute("for", "editContextAlbumFormAlbumItemSchema");
-    albumItemSchemaLabel.innerHTML = "Schema/Type of Album items: ";
-    var selected = null;
-    if (contextAlbum && contextAlbum.itemSchema != null && contextAlbum.itemSchema.name != null
-            && contextAlbum.itemSchema.version != null && contextAlbum.itemSchema.name != ""
-            && contextAlbum.itemSchema.version != "") {
-        selected = {
-            "name" : contextAlbum.itemSchema.name,
-            "version" : contextAlbum.itemSchema.version,
-            "displaytext" : contextAlbum.itemSchema.name + ":" + contextAlbum.itemSchema.version,
-            "contextAlbum" : contextAlbum
-        };
-    }
-    var selectDiv = dropdownList("editContextAlbumFormAlbumItemSchema", contextSchemas, selected, disabled, null);
-    if (selectDiv == null) {
-        console.error("Cannot create a Context Album because there are no contextSchemas to add to it");
-        alert("Cannot create a Context Album because there are no contextSchemas to add to it");
-        editContextAlbumForm_cancelPressed();
-    } else {
-        albumItemSchemaLI.appendChild(selectDiv);
-    }
-
-    var inputLI = document.createElement("li");
-    formul.appendChild(inputLI);
-    if (createEditOrView == "CREATE") {
-        var generateUUIDInput = document.createElement("button");
-        inputLI.appendChild(generateUUIDInput);
-        generateUUIDInput.setAttribute("id", "generateUUID");
-        generateUUIDInput.setAttribute("class", "ebBtn ebBtn_large");
-        generateUUIDInput.setAttribute("type", "submit");
-        generateUUIDInput.setAttribute("value", "Generate UUID");
-        generateUUIDInput.onclick = editContextAlbumForm_generateUUIDPressed;
-        generateUUIDInput.innerHTML = generateUUIDInput.getAttribute("value");
-        var inputSpan0 = document.createElement("span");
-        inputLI.appendChild(inputSpan0);
-        inputSpan0.setAttribute("class", "required");
-        inputSpan0.innerHTML = " ";
-    }
-    if (createEditOrView == "CREATE") {
-        var generateDescriptionInput = document.createElement("button");
-        inputLI.appendChild(generateDescriptionInput);
-        generateDescriptionInput.setAttribute("id", "generateDescription");
-        generateDescriptionInput.setAttribute("class", "ebBtn ebBtn_large");
-        generateDescriptionInput.setAttribute("type", "submit");
-        generateDescriptionInput.setAttribute("value", "Generate Description");
-        generateDescriptionInput.onclick = editContextAlbumForm_generateDescriptionPressed;
-        generateDescriptionInput.innerHTML = generateDescriptionInput.getAttribute("value");
-        var inputSpan1 = document.createElement("span");
-        inputLI.appendChild(inputSpan1);
-        inputSpan1.setAttribute("class", "required");
-        inputSpan1.innerHTML = " ";
-    }
-
-    var cancelInput = document.createElement("button");
-    inputLI.appendChild(cancelInput);
-    cancelInput.setAttribute("id", "cancel");
-    cancelInput.setAttribute("class", "ebBtn ebBtn_large");
-    cancelInput.setAttribute("type", "submit");
-    cancelInput.setAttribute("value", "Cancel");
-    cancelInput.onclick = editContextAlbumForm_cancelPressed;
-    cancelInput.innerHTML = cancelInput.getAttribute("value");
-
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var inputSpan2 = document.createElement("span");
-        inputLI.appendChild(inputSpan2);
-        inputSpan2.setAttribute("class", "required");
-        inputSpan2.innerHTML = " ";
-
-        var submitInput = document.createElement("button");
-        inputLI.appendChild(submitInput);
-        submitInput.setAttribute("id", "submit");
-        submitInput.setAttribute("class", "ebBtn ebBtn_large");
-        submitInput.setAttribute("type", "submit");
-        submitInput.setAttribute("value", "Submit");
-        submitInput.onclick = editContextAlbumForm_submitPressed;
-        submitInput.innerHTML = submitInput.getAttribute("value");
-    }
-
-    formParent.appendChild(contentelement);
-    scrollToTop();
-}
-
-function editContextAlbumForm_generateUUIDPressed() {
-    document.getElementById("editContextAlbumFormUuidInput").value = formUtils_generateUUID();
-}
-
-function editContextAlbumForm_generateDescriptionPressed() {
-    document.getElementById("editContextAlbumFormDescriptionTextArea").value = formUtils_generateDescription(document
-            .getElementById("editContextAlbumFormNameInput").value, document
-            .getElementById("editContextAlbumFormVersionInput").value, document
-            .getElementById("editContextAlbumFormUuidInput").value);
-}
-
-function editContextAlbumForm_cancelPressed() {
-    apexUtils_removeElement("editContextAlbumFormDiv");
-    contextAlbumTab_reset();
-}
-
-function editContextAlbumForm_submitPressed() {
-    var createEditOrView = $('#editContextAlbumForm').attr("createEditOrView");
-    if (!createEditOrView || createEditOrView == "" || (createEditOrView != "CREATE" && createEditOrView != "EDIT")) {
-        console.error("Invalid operation \"" + createEditOrView
-                + "\" passed to editContextAlbumForm_submitPressed function. Edit failed");
-        apexUtils_removeElement("editContextAlbumFormDiv");
-        contextAlbumTab_reset();
-        return;
-    }
-
-    var name = $('#editContextAlbumFormNameInput').val();
-    var version = $('#editContextAlbumFormVersionInput').val();
-
-    var selectedschema = document.getElementById("editContextAlbumFormAlbumItemSchema_dropdownList").selectedOption;
-    if (selectedschema == null) {
-        alert("Context Album \"" + name + "\" has no selected Album Item Schema/Type");
-        return false;
-    }
-    var itemschema = {
-        "name" : selectedschema.name,
-        "version" : selectedschema.version
-    };
-
-    var scope = $('#editContextAlbumFormAlbumScopeInput').val().toUpperCase();
-    if (scope != "APPLICATION" && scope != "EXTERNAL" && scope != "GLOBAL") {
-        var message = "Are you sure you want to set the scope ContextAlbum to \"" + scope
-                + "\"? Currently the only scope supported are: \"APPLICATION\", \"EXTERNAL\" and \"GLOBAL\"";
-        if (!apexUtils_areYouSure(message)) {
-            return false;
-        }
-    }
-    var readonly = $('#editContextAlbumFormAlbumReadOnlyCheckbox').prop('checked');
-    if (readonly && scope != "EXTERNAL") {
-        var message = "Are you sure you want to set the scope ContextAlbum to \""
-                + scope
-                + "\" while it is set as Read Only. It only makes sense to use readonly for \"EXTERNAL\" Context Albums. If this Album is readonly it cannot be set!";
-        if (!apexUtils_areYouSure(message)) {
-            return false;
-        }
-    }
-    if (!readonly && scope == "EXTERNAL") {
-        var message = "Are you sure you want to set the scope ContextAlbum to \""
-                + scope
-                + "\" while it is not set as Read Only. It only makes sense to use readonly for \"EXTERNAL\" Context Albums since EXTERNAL context cannot be set in policies.";
-        if (!apexUtils_areYouSure(message)) {
-            return false;
-        }
-    }
-
-    var jsonString = JSON.stringify({
-        "name" : name,
-        "version" : version,
-        "uuid" : $('#editContextAlbumFormUuidInput').val(),
-        "description" : $('#editContextAlbumFormDescriptionTextArea').val(),
-        "itemSchema" : itemschema,
-        "scope" : scope,
-        "writeable" : !readonly
-    });
-
-    if (createEditOrView == "CREATE") {
-        var requestURL = restRootURL + "/ContextAlbum/Create";
-        ajax_post(requestURL, jsonString, function(resultData) {
-            apexUtils_removeElement("editContextAlbumFormDiv");
-            contextAlbumTab_reset();
-            keyInformationTab_reset()
-        });
-    } else if (createEditOrView == "EDIT") {
-        var requestURL = restRootURL + "/ContextAlbum/Update";
-        ajax_put(requestURL, jsonString, function(resultData) {
-            apexUtils_removeElement("editContextAlbumFormDiv");
-            contextAlbumTab_reset();
-            keyInformationTab_reset()
-        });
-    }
-
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumTab.js b/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumTab.js
deleted file mode 100644
index 685c57f59..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexContextAlbumTab.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function contextAlbumTab_reset() {
-    contextAlbumTab_deactivate();
-    contextAlbumTab_activate();
-}
-
-function contextAlbumTab_activate() {
-    contextAlbumTab_create();
-    
-    var requestURL = restRootURL + "/ContextAlbum/Get?name=&version=";
-
-    ajax_get(requestURL, function(data) {
-        $("#contextAlbumTableBody").find("tr:gt(0)").remove();
-
-        for (var i = 0; i < data.messages.message.length; i++) {
-            var contextAlbum = JSON.parse(data.messages.message[i]).apexContextAlbum;
-
-            var contextAlbumRow_tr = document.createElement("tr");
-            var contextAlbumid = contextAlbum.key.name + ":"  + contextAlbum.key.version;
-
-            
-            var contextAlbumTableRow = 
-                "<td>"                                              +
-                contextAlbum.key.name + ":"  + contextAlbum.key.version +
-                "</td>"                                             +
-                "<td>"                                              +
-                contextAlbum.scope                                  +
-                "</td>"                                             +
-                "<td>"                                              +
-                contextAlbum.isWritable                             +
-                "</td>"                                             +
-                "<td>"                                              +
-                contextAlbum.itemSchema.name + ":"  + contextAlbum.itemSchema.version +
-                "</td>"   ;
-
-            contextAlbumRow_tr.innerHTML = contextAlbumTableRow; 
-            contextAlbumRow_tr.addEventListener('contextmenu', rightClickMenu_scopePreserver("contextAlbumTabContent", "contextAlbum", contextAlbum.key.name, contextAlbum.key.version));  
-
-            $("#contextAlbumTableBody").append(contextAlbumRow_tr);
-
-        }
-    });
-}
-
-function contextAlbumTab_deactivate() {
-    apexUtils_removeElement("contextAlbumTabContent");
-}
-
-function contextAlbumTab_create() {
-    var contextAlbumTab = document.getElementById("contextAlbumsTab");
-
-    var contextAlbumTabContent = document.getElementById("contextAlbumTabContent");
-    if (contextAlbumTabContent != null) {
-        return
-    }
-
-    var contextAlbumTabContent = document.createElement("contextAlbumTabContent");
-    contextAlbumTab.appendChild(contextAlbumTabContent);
-    contextAlbumTabContent.setAttribute("id", "contextAlbumTabContent");
-    contextAlbumTabContent.addEventListener('contextmenu', rightClickMenu_scopePreserver("contextAlbumTabContent", "contextAlbum",null, null));  
-
-    var contextAlbumTable = createTable("contextAlbumTable");
-    contextAlbumTabContent.appendChild(contextAlbumTable);
-
-    var contextAlbumTableHeader = document.createElement("thead");
-    contextAlbumTable.appendChild(contextAlbumTableHeader);
-    contextAlbumTableHeader.setAttribute("id", "contextAlbumTableHeader");
-
-    var contextAlbumTableHeaderRow = document.createElement("tr");
-    contextAlbumTableHeader.appendChild(contextAlbumTableHeaderRow);
-    contextAlbumTableHeaderRow.setAttribute("id", "contextAlbumTableHeaderRow");
-
-    var contextAlbumTableKeyHeader = document.createElement("th");
-    contextAlbumTableHeaderRow.appendChild(contextAlbumTableKeyHeader);
-    contextAlbumTableKeyHeader.setAttribute("id", "contextAlbumTableKeyHeader");
-    contextAlbumTableKeyHeader.appendChild(document.createTextNode("Context Album"));
-
-    var contextAlbumTableScopeHeader = document.createElement("th");
-    contextAlbumTableHeaderRow.appendChild(contextAlbumTableScopeHeader);
-    contextAlbumTableScopeHeader.setAttribute("id", "contextAlbumTableScopeHeader");
-    contextAlbumTableScopeHeader.appendChild(document.createTextNode("Scope"));
-
-    var contextAlbumTableWriteableHeader = document.createElement("th");
-    contextAlbumTableHeaderRow.appendChild(contextAlbumTableWriteableHeader);
-    contextAlbumTableWriteableHeader.setAttribute("id", "contextAlbumTableWritableHeader");
-    contextAlbumTableWriteableHeader.appendChild(document.createTextNode("Writable"));
-
-    var contextAlbumTableItemSchemaHeader = document.createElement("th");
-    contextAlbumTableHeaderRow.appendChild(contextAlbumTableItemSchemaHeader);
-    contextAlbumTableItemSchemaHeader.setAttribute("id", "contextAlbumTableItemSchemaHeader");
-    contextAlbumTableItemSchemaHeader.appendChild(document.createTextNode("Item Schema"));
-
-    var contextAlbumTableBody = document.createElement("tbody");
-    contextAlbumTable.appendChild(contextAlbumTableBody);
-    contextAlbumTable.setAttribute("id", "contextAlbumTableBody");
-}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexContextSchemaEditForm.js b/client/client-editor/src/main/resources/webapp/js/ApexContextSchemaEditForm.js
deleted file mode 100644
index 52dcff894..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexContextSchemaEditForm.js
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function editContextSchemaForm_createContextSchema(formParent) {
-    return editContextSchemaForm_activate(formParent, "CREATE", null);
-}
-
-function editContextSchemaForm_deleteContextSchema(parent, name, version) {
-    var message = "Are you sure you want to delete ContextSchema \"" + name + ":" + version + "\"?";
-    if (apexUtils_areYouSure(message)) {
-        var requestURL = restRootURL + "/ContextSchema/Delete?name=" + name + "&version=" + version;
-        ajax_delete(requestURL, function(data) {
-            apexUtils_removeElement("editContextSchemaFormDiv");
-            contextSchemaTab_reset();
-            keyInformationTab_reset()
-        });
-    }
-}
-
-function editContextSchemaForm_viewContextSchema(parent, name, version) {
-    var requestURL = restRootURL + "/ContextSchema/Get?name=" + name + "&version=" + version;
-    ajax_getWithKeyInfo(requestURL, "apexContextSchema", function(contextSchema) {
-        editContextSchemaForm_activate(parent, "VIEW", contextSchema);
-    });
-}
-
-function editContextSchemaForm_editContextSchema(formParent, name, version) {
-    var requestURL = restRootURL + "/ContextSchema/Get?name=" + name + "&version=" + version;
-    ajax_getWithKeyInfo(requestURL, "apexContextSchema", function(contextSchema) {
-        editContextSchemaForm_activate(formParent, "EDIT", contextSchema);
-    });
-}
-
-function editContextSchemaForm_activate(parent, operation, contextSchema) {
-    apexUtils_removeElement("editContextSchemaFormDiv");
-    var formParent = document.getElementById(parent);
-    apexUtils_emptyElement(parent);
-
-    var isedit = false;
-    var createEditOrView = "";
-
-    if (!operation) {
-        console.warn("No operation specified for ContextSchemaForm form")
-    } else {
-        createEditOrView = operation.toUpperCase();
-    }
-
-    if (createEditOrView == "CREATE") {
-        isedit = true;
-    } else if (createEditOrView == "EDIT" || createEditOrView == "VIEW") {
-        if (createEditOrView == "EDIT") {
-            isedit = true;
-        }
-
-        if (!contextSchema) {
-            console.warn("Invalid value (\"" + contextSchema
-                    + "\") passed as a value for \"contextSchema\" for ContextSchemaForm form.");
-        } else {
-            if (!contextSchema.key || !contextSchema.key.name || contextSchema.key.name == "") {
-                console.warn("Invalid value (\"" + contextSchema.key.name
-                        + "\") passed as a value for \"name\" for ContextSchemaForm form.");
-            }
-            if (!contextSchema.key || !contextSchema.key.version || contextSchema.key.version == "") {
-                console.warn("Invalid value (\"" + contextSchema.key.version
-                        + "\") passed as a value for \"version\" for ContextSchemaForm form.");
-            }
-            if (!contextSchema.uuid || contextSchema.uuid == "") {
-                console.warn("Invalid value (\"" + contextSchema.uuid
-                        + "\") passed as a value for \"uuid\" for ContextSchemaForm form.");
-            }
-            if (createEditOrView == "VIEW") {
-                if (!contextSchema.description) {
-                    console.warn("Invalid value (\"" + contextSchema.description
-                            + "\") passed as a value for \"description\" for ContextSchemaForm form.");
-                }
-                if (!contextSchema.schemaFlavour || contextSchema.schemaFlavour == "") {
-                    console.warn("Invalid value (\"" + contextSchema.schemaFlavour
-                            + "\") passed as a value for \"schemaFlavour\" for ContextSchemaForm form.");
-                }
-                if (!contextSchema.schemaDefinition || contextSchema.schemaDefinition == "") {
-                    console.warn("Invalid value (\"" + contextSchema.schemaDefinition
-                            + "\") passed as a value for \"schemaDefinition\" for ContextSchemaForm form.");
-                }
-            }
-        }
-    } else {
-        console
-                .warn("Invalid operation (\""
-                        + operation
-                        + "\") specified for ContextSchemaForm form. Only \"Create\", \"Edit\" and \"View\" operations are supported");
-    }
-
-    var contentelement = document.createElement("editContextSchemaFormDiv");
-    var formDiv = document.createElement("div");
-    contentelement.appendChild(formDiv);
-    formDiv.setAttribute("id", "editContextSchemaFormDiv");
-    formDiv.setAttribute("class", "editContextSchemaFormDiv");
-
-    var headingSpan = document.createElement("h2");
-    headingSpan.innerHTML = "Context Item Schema Editor";
-    formDiv.appendChild(headingSpan);
-
-    var form = document.createElement("editContextSchemaForm");
-    formDiv.appendChild(form);
-
-    form.setAttribute("id", "editContextSchemaForm");
-    form.setAttribute("class", "form-style-1");
-    form.setAttribute("method", "post");
-    form.setAttribute("createEditOrView", createEditOrView);
-
-    var formul = document.createElement("ul");
-    form.appendChild(formul);
-
-    var nameLI = document.createElement("li");
-    formul.appendChild(nameLI);
-    var nameLabel = document.createElement("label");
-    nameLI.appendChild(nameLabel);
-    nameLabel.setAttribute("for", "editContextSchemaFormNameInput");
-    nameLabel.innerHTML = "Name: ";
-    var nameLabelSpan = document.createElement("span");
-    nameLabel.appendChild(nameLabelSpan);
-    nameLabelSpan.setAttribute("class", "required");
-    nameLabelSpan.innerHTML = "*";
-    var nameInput = document.createElement("input");
-    nameLI.appendChild(nameInput);
-    nameInput.setAttribute("id", "editContextSchemaFormNameInput");
-    nameInput.setAttribute("type", "text");
-    nameInput.setAttribute("name", "editContextSchemaFormameInput");
-    nameInput.setAttribute("class", "field ebInput");
-    nameInput.setAttribute("placeholder", "name");
-    if (contextSchema && contextSchema.key && contextSchema.key.name) {
-        nameInput.value = contextSchema.key.name;
-    }
-    if (createEditOrView != "CREATE") {
-        nameInput.readOnly = true;
-    }
-
-    var versionLI = document.createElement("li");
-    formul.appendChild(versionLI);
-    var versionLabel = document.createElement("label");
-    versionLI.appendChild(versionLabel);
-    versionLabel.setAttribute("for", "editContextSchemaFormVersionInput");
-    versionLabel.innerHTML = "Version: ";
-    var versionInput = document.createElement("input");
-    versionLI.appendChild(versionInput);
-    versionInput.setAttribute("id", "editContextSchemaFormVersionInput");
-    versionInput.setAttribute("type", "text");
-    versionInput.setAttribute("name", "editContextSchemaFormVersionInput");
-    versionInput.setAttribute("class", "field ebInput");
-    versionInput.setAttribute("placeholder", "0.0.1");
-    if (contextSchema && contextSchema.key && contextSchema.key.version) {
-        versionInput.value = contextSchema.key.version;
-    }
-    if (createEditOrView != "CREATE") {
-        versionInput.readOnly = true;
-    }
-
-    var uuidLI = document.createElement("li");
-    formul.appendChild(uuidLI);
-    var uuidLabel = document.createElement("label");
-    uuidLI.appendChild(uuidLabel);
-    uuidLabel.setAttribute("for", "editContextSchemaFormUuidInput");
-    uuidLabel.innerHTML = "UUID: ";
-    var uuidInput = document.createElement("input");
-    uuidLI.appendChild(uuidInput);
-    uuidInput.setAttribute("id", "editContextSchemaFormUuidInput");
-    uuidInput.setAttribute("type", "text");
-    uuidInput.setAttribute("name", "editContextSchemaFormUuidInput");
-    uuidInput.setAttribute("class", "field-long ebInput ebInput_width_full");
-    uuidInput.setAttribute("placeholder", "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
-    if (contextSchema && contextSchema.uuid) {
-        uuidInput.value = contextSchema.uuid;
-    }
-    if (createEditOrView != "CREATE") {
-        uuidInput.readOnly = true;
-    }
-
-    var descriptionLI = document.createElement("li");
-    formul.appendChild(descriptionLI);
-    var descriptionLabel = document.createElement("label");
-    descriptionLI.appendChild(descriptionLabel);
-    descriptionLabel.setAttribute("for", "editContextSchemaFormDescriptionTextArea");
-    descriptionLabel.innerHTML = "Description: ";
-    var descriptionTextArea = document.createElement("textarea");
-    descriptionLI.appendChild(descriptionTextArea);
-    descriptionTextArea.setAttribute("id", "editContextSchemaFormDescriptionTextArea");
-    descriptionTextArea.setAttribute("name", "editContextSchemaFormDescriptionTextArea");
-    descriptionTextArea.setAttribute("class", "field-long field-textarea ebTextArea ebTextArea_width_full");
-    if (contextSchema && contextSchema.description) {
-        descriptionTextArea.value = contextSchema.description;
-    }
-    if (createEditOrView != "CREATE" && createEditOrView != "EDIT") {
-        descriptionTextArea.readOnly = true;
-    }
-
-    var schemaFlavourLI = document.createElement("li");
-    formul.appendChild(schemaFlavourLI);
-    var schemaFlavourLabel = document.createElement("label");
-    schemaFlavourLI.appendChild(schemaFlavourLabel);
-    schemaFlavourLabel.setAttribute("for", "editContextSchemaFormSchemaFlavourInput");
-    schemaFlavourLabel.innerHTML = "Schema Flavour: ";
-    var schemaFlavourInput = document.createElement("input");
-    schemaFlavourLI.appendChild(schemaFlavourInput);
-    schemaFlavourInput.setAttribute("id", "editContextSchemaFormSchemaFlavourInput");
-    schemaFlavourInput.setAttribute("type", "text");
-    schemaFlavourInput.setAttribute("name", "editContextSchemaFormSchemaFlavourInput");
-    schemaFlavourInput.setAttribute("class", "field-long ebInput ebInput_width_full");
-    schemaFlavourInput.setAttribute("placeholder", "Java");
-    if (contextSchema && contextSchema.schemaFlavour) {
-        schemaFlavourInput.value = contextSchema.schemaFlavour;
-    }
-    if (createEditOrView != "CREATE" && createEditOrView != "EDIT") {
-        schemaFlavourInput.readOnly = true;
-    }
-
-    var schemaDefinitionLI = document.createElement("li");
-    formul.appendChild(schemaDefinitionLI);
-    var schemaDefinitionLabel = document.createElement("label");
-    schemaDefinitionLI.appendChild(schemaDefinitionLabel);
-    schemaDefinitionLabel.setAttribute("for", "editContextSchemaFormSchemaDefinitionInput");
-    schemaDefinitionLabel.innerHTML = "Schema Definition: ";
-    var schemaDefinitionInput = document.createElement("textarea");
-    schemaDefinitionLI.appendChild(schemaDefinitionInput);
-    schemaDefinitionInput.setAttribute("id", "editContextSchemaFormSchemaDefinitionInput");
-    schemaDefinitionInput.setAttribute("type", "text");
-    schemaDefinitionInput.setAttribute("name", "editContextSchemaFormSchemaDefinitionInput");
-    schemaDefinitionInput.setAttribute("class", "field-long field-textarea ebTextArea ebTextArea_width_full");
-    schemaDefinitionInput.setAttribute("placeholder", "java.lang.String");
-    if (contextSchema && contextSchema.schemaDefinition) {
-        schemaDefinitionInput.value = contextSchema.schemaDefinition;
-    }
-    if (createEditOrView != "CREATE" && createEditOrView != "EDIT") {
-        schemaDefinitionInput.readOnly = true;
-    }
-
-    var inputLI = document.createElement("li");
-    formul.appendChild(inputLI);
-    if (createEditOrView == "CREATE") {
-        var generateUUIDInput = document.createElement("button");
-        inputLI.appendChild(generateUUIDInput);
-        generateUUIDInput.setAttribute("id", "generateUUID");
-        generateUUIDInput.setAttribute("class", "ebBtn ebBtn_large");
-        generateUUIDInput.setAttribute("type", "submit");
-        generateUUIDInput.setAttribute("value", "Generate UUID");
-        generateUUIDInput.onclick = editContextSchemaForm_generateUUIDPressed;
-        generateUUIDInput.innerHTML = generateUUIDInput.getAttribute("value");
-        var inputSpan0 = document.createElement("span");
-        inputLI.appendChild(inputSpan0);
-        inputSpan0.setAttribute("class", "required");
-        inputSpan0.innerHTML = " ";
-    }
-    if (createEditOrView == "CREATE") {
-        var generateDescriptionInput = document.createElement("button");
-        inputLI.appendChild(generateDescriptionInput);
-        generateDescriptionInput.setAttribute("id", "generateDescription");
-        generateDescriptionInput.setAttribute("class", "ebBtn ebBtn_large");
-        generateDescriptionInput.setAttribute("type", "submit");
-        generateDescriptionInput.setAttribute("value", "Generate Description");
-        generateDescriptionInput.onclick = editContextSchemaForm_generateDescriptionPressed;
-        generateDescriptionInput.innerHTML = generateDescriptionInput.getAttribute("value");
-
-        var inputSpan1 = document.createElement("span");
-        inputLI.appendChild(inputSpan1);
-        inputSpan1.setAttribute("class", "required");
-        inputSpan1.innerHTML = " ";
-    }
-
-    var cancelInput = document.createElement("button");
-    inputLI.appendChild(cancelInput);
-    cancelInput.setAttribute("id", "cancel");
-    cancelInput.setAttribute("class", "ebBtn ebBtn_large");
-    cancelInput.setAttribute("type", "submit");
-    cancelInput.setAttribute("value", "Cancel");
-    cancelInput.onclick = editContextSchemaForm_cancelPressed;
-    cancelInput.innerHTML = cancelInput.getAttribute("value");
-
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var inputSpan2 = document.createElement("span");
-        inputLI.appendChild(inputSpan2);
-        inputSpan2.setAttribute("class", "required");
-        inputSpan2.innerHTML = " ";
-
-        var submitInput = document.createElement("button");
-        inputLI.appendChild(submitInput);
-        submitInput.setAttribute("id", "submit");
-        submitInput.setAttribute("class", "ebBtn ebBtn_large");
-        submitInput.setAttribute("type", "submit");
-        submitInput.setAttribute("value", "Submit");
-        submitInput.onclick = editContextSchemaForm_submitPressed;
-        submitInput.innerHTML = submitInput.getAttribute("value");
-    }
-
-    formParent.appendChild(contentelement);
-    scrollToTop();
-}
-
-function editContextSchemaForm_generateUUIDPressed() {
-    document.getElementById("editContextSchemaFormUuidInput").value = formUtils_generateUUID();
-}
-
-function editContextSchemaForm_generateDescriptionPressed() {
-    document.getElementById("editContextSchemaFormDescriptionTextArea").value = formUtils_generateDescription(document
-            .getElementById("editContextSchemaFormNameInput").value, document
-            .getElementById("editContextSchemaFormVersionInput").value, document
-            .getElementById("editContextSchemaFormUuidInput").value);
-}
-
-function editContextSchemaForm_cancelPressed() {
-    apexUtils_removeElement("editContextSchemaFormDiv");
-    contextSchemaTab_reset();
-}
-
-function editContextSchemaForm_submitPressed() {
-    var createEditOrView = $('#editContextSchemaForm').attr("createEditOrView");
-    if (!createEditOrView || createEditOrView == "" || (createEditOrView != "CREATE" && createEditOrView != "EDIT")) {
-        console.error("Invalid operation \"" + createEditOrView
-                + "\" passed to editContextSchemaForm_submitPressed function. Edit failed");
-        apexUtils_removeElement("editContextSchemaFormDiv");
-        contextSchemaTab_reset();
-        return;
-    }
-
-    var name = $('#editContextSchemaFormNameInput').val();
-    var version = $('#editContextSchemaFormVersionInput').val()
-
-    var jsonString = JSON.stringify({
-        "name" : name,
-        "version" : version,
-        "uuid" : $('#editContextSchemaFormUuidInput').val(),
-        "description" : $('#editContextSchemaFormDescriptionTextArea').val(),
-        "schemaFlavour" : $('#editContextSchemaFormSchemaFlavourInput').val(),
-        "schemaDefinition" : $('#editContextSchemaFormSchemaDefinitionInput').val(),
-    });
-
-    if (createEditOrView == "CREATE") {
-        var requestURL = restRootURL + "/ContextSchema/Create";
-        ajax_post(requestURL, jsonString, function(resultData) {
-            apexUtils_removeElement("editContextSchemaFormDiv");
-            contextSchemaTab_reset();
-            keyInformationTab_reset()
-        });
-    } else if (createEditOrView == "EDIT") {
-        var requestURL = restRootURL + "/ContextSchema/Update";
-        ajax_put(requestURL, jsonString, function(resultData) {
-            apexUtils_removeElement("editContextSchemaFormDiv");
-            contextSchemaTab_reset();
-            keyInformationTab_reset()
-        });
-    }
-
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexContextSchemaTab.js b/client/client-editor/src/main/resources/webapp/js/ApexContextSchemaTab.js
deleted file mode 100644
index fa4080a7c..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexContextSchemaTab.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function contextSchemaTab_reset() {
-    contextSchemaTab_deactivate();
-    contextSchemaTab_activate();
-}
-function contextSchemaTab_activate() {
-    contextSchemaTab_create();
-
-    var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
-
-    ajax_get(requestURL, function(data) {
-        $("#contextSchemaTableBody").find("tr:gt(0)").remove();
-
-        for (var i = 0; i < data.messages.message.length; i++) {
-            var contextSchema = JSON.parse(data.messages.message[i]).apexContextSchema;
-
-            var contextSchemaRow_tr = document.createElement("tr");
-            var contextSchemaid = contextSchema.key.name + ":"  + contextSchema.key.version;
-
-            var contextSchemaRow =
-                "<td>"                                                    +
-                contextSchemaid                                         +
-                "</td>"                                                    +
-                "<td>"                                                    +
-                contextSchema.schemaFlavour                                +
-                "</td>"                                                    +
-                "<td><java>"                                            +
-                apexUtils_escapeHtml(contextSchema.schemaDefinition)    +
-                "</java></td>";
-
-            contextSchemaRow_tr.innerHTML = contextSchemaRow; 
-            contextSchemaRow_tr.addEventListener('contextmenu', rightClickMenu_scopePreserver("contextSchemaTabContent", "ContextSchema", contextSchema.key.name, contextSchema.key.version));  
-
-            $("#contextSchemaTableBody").append(contextSchemaRow_tr);
-        }
-    });
-}
-
-function contextSchemaTab_deactivate() {
-    apexUtils_removeElement("contextSchemaTabContent");
-}
-
-function contextSchemaTab_create() {
-    var contextSchemaTab = document.getElementById("contextSchemasTab");
-
-    var contextSchemaTabContent = document.getElementById("contextSchemaTabContent");
-    if (contextSchemaTabContent != null) {
-        return
-    }
-
-    var contextSchemaTabContent = document.createElement("contextSchemaTabContent");
-    contextSchemaTab.appendChild(contextSchemaTabContent);
-    contextSchemaTabContent.setAttribute("id", "contextSchemaTabContent");
-    contextSchemaTabContent.addEventListener('contextmenu', rightClickMenu_scopePreserver("contextSchemaTabContent", "ContextSchema",null,null));  
-
-    var contextSchemaTable = createTable("contextSchemaTable");
-    contextSchemaTabContent.appendChild(contextSchemaTable);
-
-    var contextSchemaTableHeader = document.createElement("thead");
-    contextSchemaTable.appendChild(contextSchemaTableHeader);
-    contextSchemaTableHeader.setAttribute("id", "contextSchemaTableHeader");
-
-    var contextSchemaTableHeaderRow = document.createElement("tr");
-    contextSchemaTableHeader.appendChild(contextSchemaTableHeaderRow);
-    contextSchemaTableHeaderRow.setAttribute("id", "contextSchemaTableHeaderRow");
-
-    var contextSchemaTableKeyHeader = document.createElement("th");
-    contextSchemaTableHeaderRow.appendChild(contextSchemaTableKeyHeader);
-    contextSchemaTableKeyHeader.setAttribute("id", "contextSchemaTableKeyHeader");
-    contextSchemaTableKeyHeader.appendChild(document.createTextNode("Context Item"));
-
-    var contextSchemaTableSchemaFlavourHeader = document.createElement("th");
-    contextSchemaTableHeaderRow.appendChild(contextSchemaTableSchemaFlavourHeader);
-    contextSchemaTableSchemaFlavourHeader.setAttribute("id", "contextSchemaTableJavatypeHeader");
-    contextSchemaTableSchemaFlavourHeader.appendChild(document.createTextNode("Schema Flavour"));
-
-    var contextSchemaTableSchemaDefHeader = document.createElement("th");
-    contextSchemaTableHeaderRow.appendChild(contextSchemaTableSchemaDefHeader);
-    contextSchemaTableSchemaDefHeader.setAttribute("id", "contextSchemaTableJavatypeHeader");
-    contextSchemaTableSchemaDefHeader.appendChild(document.createTextNode("Context Item Schema Definition"));
-
-    var contextSchemaTableBody = document.createElement("tbody");
-    contextSchemaTable.appendChild(contextSchemaTableBody);
-    contextSchemaTable.setAttribute("id", "contextSchemaTableBody");
-}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexEventEditForm.js b/client/client-editor/src/main/resources/webapp/js/ApexEventEditForm.js
deleted file mode 100644
index 51408e31a..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexEventEditForm.js
+++ /dev/null
@@ -1,566 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function editEventForm_deleteEvent(parent, name, version) {
-    var message = "Are you sure you want to delete Event \"" + name + ":" + version + "\"?";
-    if (apexUtils_areYouSure(message)) {
-        var requestURL = restRootURL + "/Event/Delete?name=" + name + "&version=" + version;
-        ajax_delete(requestURL, function(data) {
-            apexUtils_removeElement("editEventFormDiv");
-            eventTab_reset();
-            keyInformationTab_reset()
-        });
-    }
-}
-
-function editEventForm_viewEvent(formParent, name, version) {
-    editEventForm_editEvent_inner(formParent, name, version, "VIEW");
-}
-
-function editEventForm_editEvent(formParent, name, version) {
-    editEventForm_editEvent_inner(formParent, name, version, "EDIT");
-}
-
-function editEventForm_createEvent(formParent) {
-    // Get all contextSchemas too for event params
-    var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
-    var contextSchemas = new Array();
-    ajax_get(requestURL, function(data2) {
-        for (var i = 0; i < data2.messages.message.length; i++) {
-            var contextSchema = JSON.parse(data2.messages.message[i]).apexContextSchema;
-            var dt = {
-                "name" : contextSchema.key.name,
-                "version" : contextSchema.key.version,
-                "displaytext" : contextSchema.key.name + ":" + contextSchema.key.version,
-                "contextSchema" : contextSchema
-            };
-            contextSchemas.push(dt);
-        }
-        editEventForm_activate(formParent, "CREATE", null, contextSchemas);
-    });
-}
-
-function editEventForm_editEvent_inner(formParent, name, version, viewOrEdit) {
-    var requestURL = restRootURL + "/Event/Get?name=" + name + "&version=" + version;
-    ajax_getWithKeyInfo(requestURL, "apexEvent", function(event) {
-        // Get all contextSchemas too for event params
-        var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
-        var contextSchemas = new Array();
-        ajax_get(requestURL, function(data2) {
-            for (var i = 0; i < data2.messages.message.length; i++) {
-                var contextSchema = JSON.parse(data2.messages.message[i]).apexContextSchema;
-                contextSchemas.push({
-                    "name" : contextSchema.key.name,
-                    "version" : contextSchema.key.version,
-                    "displaytext" : contextSchema.key.name + ":" + contextSchema.key.version,
-                    "contextSchema" : contextSchema
-                });
-            }
-            editEventForm_activate(formParent, viewOrEdit, event, contextSchemas);
-        });
-    });
-}
-
-function editEventForm_activate(parent, operation, event, contextSchemas) {
-    apexUtils_removeElement("editEventFormDiv");
-    var formParent = document.getElementById(parent);
-    apexUtils_emptyElement(parent);
-
-    var isedit = false;
-    var createEditOrView = "";
-    if (!operation) {
-        console.warn("No operation specified for EventForm form")
-    } else {
-        createEditOrView = operation.toUpperCase()
-    }
-    if (createEditOrView == "CREATE") {
-        isedit = true;
-    } else if (createEditOrView == "EDIT" || createEditOrView == "VIEW") {
-        if (createEditOrView == "EDIT") {
-            isedit = true;
-        }
-
-        if (!event) {
-            console.warn("Invalid value (\"" + event + "\") passed as a value for \"event\" for EventForm form.");
-        } else {
-            if (!event.key || !event.key.name || event.key.name == "") {
-                console.warn("Invalid value (\"" + event.key.name
-                        + "\") passed as a value for \"name\" for EventForm form.");
-            }
-            if (!event.key || !event.key.version || event.key.version == "") {
-                console.warn("Invalid value (\"" + event.key.version
-                        + "\") passed as a value for \"version\" for EventForm form.");
-            }
-            if (!event.uuid || event.uuid == "") {
-                console.warn("Invalid value (\"" + event.uuid
-                        + "\") passed as a value for \"uuid\" for EventForm form.");
-            }
-        }
-    } else {
-        console.warn("Invalid operation (\"" + operation
-                + "\") specified for EventForm form. Only \"Create\", \"Edit\" and \"View\" operations are supported");
-    }
-
-    var contentelement = document.createElement("editEventFormDiv");
-    var formDiv = document.createElement("div");
-    contentelement.appendChild(formDiv);
-    formDiv.setAttribute("id", "editEventFormDiv");
-    formDiv.setAttribute("class", "editEventFormDiv");
-
-    var headingSpan = document.createElement("h2");
-    formDiv.appendChild(headingSpan);
-
-    headingSpan.innerHTML = "Event Editor";
-
-    var form = document.createElement("editEventForm");
-    formDiv.appendChild(form);
-
-    form.setAttribute("id", "editEventForm");
-    form.setAttribute("class", "form-style-1");
-    form.setAttribute("method", "post");
-    form.setAttribute("createEditOrView", createEditOrView);
-
-    var formul = document.createElement("ul");
-    form.appendChild(formul);
-
-    var nameLI = document.createElement("li");
-    formul.appendChild(nameLI);
-    var nameLabel = document.createElement("label");
-    nameLI.appendChild(nameLabel);
-    nameLabel.setAttribute("for", "editEventFormNameInput");
-    nameLabel.innerHTML = "Name: ";
-    var nameLabelSpan = document.createElement("span");
-    nameLabel.appendChild(nameLabelSpan);
-    nameLabelSpan.setAttribute("class", "required");
-    nameLabelSpan.innerHTML = "*";
-    var nameInput = document.createElement("input");
-    nameLI.appendChild(nameInput);
-    nameInput.setAttribute("id", "editEventFormNameInput");
-    nameInput.setAttribute("type", "text");
-    nameInput.setAttribute("name", "editEventFormNameInput");
-    nameInput.setAttribute("class", "field ebInput");
-    nameInput.setAttribute("placeholder", "name");
-    if (event && event.key && event.key.name) {
-        nameInput.value = event.key.name;
-    }
-    if (createEditOrView != "CREATE") {
-        nameInput.readOnly = true;
-    }
-
-    var versionLI = document.createElement("li");
-    formul.appendChild(versionLI);
-    var versionLabel = document.createElement("label");
-    versionLI.appendChild(versionLabel);
-    versionLabel.setAttribute("for", "editEventFormVersionInput");
-    versionLabel.innerHTML = "Version: ";
-    var versionInput = document.createElement("input");
-    versionLI.appendChild(versionInput);
-    versionInput.setAttribute("id", "editEventFormVersionInput");
-    versionInput.setAttribute("type", "text");
-    versionInput.setAttribute("name", "editEventFormVersionInput");
-    versionInput.setAttribute("class", "field ebInput");
-    versionInput.setAttribute("placeholder", "0.0.1");
-    if (event && event.key && event.key.version) {
-        versionInput.value = event.key.version;
-    }
-    if (createEditOrView != "CREATE") {
-        versionInput.readOnly = true;
-    }
-
-    var uuidLI = document.createElement("li");
-    formul.appendChild(uuidLI);
-    var uuidLabel = document.createElement("label");
-    uuidLI.appendChild(uuidLabel);
-    uuidLabel.setAttribute("for", "editEventFormUuidInput");
-    uuidLabel.innerHTML = "UUID: ";
-    var uuidInput = document.createElement("input");
-    uuidLI.appendChild(uuidInput);
-    uuidInput.setAttribute("id", "editEventFormUuidInput");
-    uuidInput.setAttribute("type", "text");
-    uuidInput.setAttribute("name", "editEventFormUuidInput");
-    uuidInput.setAttribute("class", "field-long ebInput ebInput_width_full");
-    uuidInput.setAttribute("placeholder", "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
-    if (event && event.uuid) {
-        uuidInput.value = event.uuid;
-    }
-    if (createEditOrView != "CREATE") {
-        uuidInput.readOnly = true;
-    }
-
-    var descriptionLI = document.createElement("li");
-    formul.appendChild(descriptionLI);
-    var descriptionLabel = document.createElement("label");
-    descriptionLI.appendChild(descriptionLabel);
-    descriptionLabel.setAttribute("for", "editEventFormDescriptionTextArea");
-    descriptionLabel.innerHTML = "Description: ";
-    var descriptionTextArea = document.createElement("textarea");
-    descriptionLI.appendChild(descriptionTextArea);
-    descriptionTextArea.setAttribute("id", "editEventFormDescriptionTextArea");
-    descriptionTextArea.setAttribute("name", "editEventFormDescriptionTextArea");
-    descriptionTextArea.setAttribute("class", "field-long field-textarea ebTextArea ebTextArea_width_full");
-    if (event && event.description) {
-        descriptionTextArea.value = event.description;
-    }
-    if (createEditOrView != "CREATE" && createEditOrView != "EDIT") {
-        descriptionTextArea.readOnly = true;
-    }
-
-    var namespaceLI = document.createElement("li");
-    formul.appendChild(namespaceLI);
-    var namespaceLabel = document.createElement("label");
-    namespaceLI.appendChild(namespaceLabel);
-    namespaceLabel.setAttribute("for", "editEventFormNamespaceInput");
-    namespaceLabel.innerHTML = "Namespace: ";
-    var namespaceInput = document.createElement("input");
-    namespaceLI.appendChild(namespaceInput);
-    namespaceInput.setAttribute("id", "editEventFormNamespaceInput");
-    namespaceInput.setAttribute("type", "text");
-    namespaceInput.setAttribute("name", "editEventFormNamespaceInput");
-    namespaceInput.setAttribute("class", "field-namespace ebInput  ebInput ebInput_width_full");
-    namespaceInput.setAttribute("placeholder", "");
-    if (event && event.nameSpace) {
-        namespaceInput.value = event.nameSpace;
-    }
-    if (createEditOrView != "CREATE" && createEditOrView != "EDIT") {
-        namespaceInput.readOnly = true;
-    }
-
-    var sourceLI = document.createElement("li");
-    formul.appendChild(sourceLI);
-    var sourceLabel = document.createElement("label");
-    sourceLI.appendChild(sourceLabel);
-    sourceLabel.setAttribute("for", "editEventFormSourceInput");
-    sourceLabel.innerHTML = "Source: ";
-    var sourceInput = document.createElement("input");
-    sourceLI.appendChild(sourceInput);
-    sourceInput.setAttribute("id", "editEventFormSourceInput");
-    sourceInput.setAttribute("type", "text");
-    sourceInput.setAttribute("name", "editEventFormSourceInput");
-    sourceInput.setAttribute("class", "field-source ebInput");
-    sourceInput.setAttribute("placeholder", "");
-    if (event && event.source) {
-        sourceInput.value = event.source;
-    }
-    if (createEditOrView != "CREATE" && createEditOrView != "EDIT") {
-        sourceInput.readOnly = true;
-    }
-
-    var targetLI = document.createElement("li");
-    formul.appendChild(targetLI);
-    var targetLabel = document.createElement("label");
-    targetLI.appendChild(targetLabel);
-    targetLabel.setAttribute("for", "editEventFormTargetInput");
-    targetLabel.innerHTML = "Target: ";
-    var targetInput = document.createElement("input");
-    targetLI.appendChild(targetInput);
-    targetInput.setAttribute("id", "editEventFormTargetInput");
-    targetInput.setAttribute("type", "text");
-    targetInput.setAttribute("name", "editEventFormTargetInput");
-    targetInput.setAttribute("class", "field-target ebInput");
-    targetInput.setAttribute("placeholder", "");
-    if (event && event.target) {
-        targetInput.value = event.target;
-    }
-    if (createEditOrView != "CREATE" && createEditOrView != "EDIT") {
-        targetInput.readOnly = true;
-    }
-
-    var parametersLI = document.createElement("li");
-    formul.appendChild(parametersLI);
-    var parametersLabel = document.createElement("label");
-    parametersLI.appendChild(parametersLabel);
-    parametersLabel.setAttribute("for", "editEventFormParametersTable");
-    parametersLabel.innerHTML = "Event Parameters: ";
-    var paramstable = document.createElement("table");
-    paramstable.setAttribute("id", "editEventFormParametersTable");
-    paramstable.setAttribute("name", "editEventFormParametersTable");
-    paramstable.setAttribute("class", "table-eventparam");
-    parametersLI.appendChild(paramstable);
-    var paramstable_head = document.createElement("thead");
-    paramstable.appendChild(paramstable_head);
-    var paramstable_head_tr = document.createElement("tr");
-    paramstable_head.appendChild(paramstable_head_tr);
-    paramstable_head_tr.appendChild(document.createElement("th")); // empty,
-                                                                    // for
-                                                                    // delete
-                                                                    // button
-    paramstable_head_th = document.createElement("th");
-    paramstable_head_tr.appendChild(paramstable_head_th);
-    paramstable_head_th.innerHTML = "Parameter Name: ";
-    paramstable_head_th.setAttribute("class", "table-eventparam-heading form-heading");
-    paramstable_head_th = document.createElement("th");
-    paramstable_head_tr.appendChild(paramstable_head_th);
-    paramstable_head_th.innerHTML = "Parameter Type/Schema: ";
-    paramstable_head_th.setAttribute("class", "table-eventparam-heading form-heading");
-    paramstable_head_th = document.createElement("th");
-    paramstable_head_tr.appendChild(paramstable_head_th);
-    paramstable_head_th.innerHTML = "Optional: ";
-    paramstable_head_th.setAttribute("class", "table-eventparam-heading form-heading");
-    var paramstable_body = document.createElement("tbody");
-    paramstable.appendChild(paramstable_body);
-    // Add the parameters
-    if (event && event.parameter && event.parameter.entry) {
-        for (var p = 0; p < event.parameter.entry.length; p++) {
-            var fieldEntry = event.parameter.entry[p];
-            var contextSchema = fieldEntry.value.fieldSchemaKey;
-            var optional = fieldEntry.value.optional;
-            contextSchema["displaytext"] = contextSchema.name + ":" + contextSchema.version;
-            editEventForm_addEventParam(paramstable_body, (createEditOrView == "VIEW"), fieldEntry.key, optional,
-                    contextSchema, contextSchemas);
-        }
-    }
-    // add the New Parameter button
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var paramTR = document.createElement("tr");
-        paramTR.setAttribute("class", "field-eventparam-tr.new");
-        paramstable_body.appendChild(paramTR);
-        var paramTD = document.createElement("td");
-        paramTD.setAttribute("colspan", "4");
-        paramTR.appendChild(paramTD);
-        var addParamInput = createAddFormButton();
-        paramTD.appendChild(addParamInput);
-        addParamInput.onclick = function() {
-            editEventForm_addEventParam(paramstable_body, false, null, false, null, contextSchemas);
-        };
-    }
-
-    var inputLI = document.createElement("li");
-    formul.appendChild(inputLI);
-    if (createEditOrView == "CREATE") {
-        var generateUUIDInput = document.createElement("button");
-        inputLI.appendChild(generateUUIDInput);
-        generateUUIDInput.setAttribute("id", "generateUUID");
-        generateUUIDInput.setAttribute("class", "ebBtn ebBtn_large");
-        generateUUIDInput.setAttribute("type", "submit");
-        generateUUIDInput.setAttribute("value", "Generate UUID");
-        generateUUIDInput.onclick = editEventForm_generateUUIDPressed;
-        generateUUIDInput.innerHTML = generateUUIDInput.getAttribute("value");
-
-        var inputSpan0 = document.createElement("span");
-        inputLI.appendChild(inputSpan0);
-        inputSpan0.setAttribute("class", "required");
-        inputSpan0.innerHTML = " ";
-    }
-    if (createEditOrView == "CREATE") {
-        var generateDescriptionInput = document.createElement("button");
-        inputLI.appendChild(generateDescriptionInput);
-        generateDescriptionInput.setAttribute("id", "generateDescription");
-        generateDescriptionInput.setAttribute("class", "ebBtn ebBtn_large");
-        generateDescriptionInput.setAttribute("type", "submit");
-        generateDescriptionInput.setAttribute("value", "Generate Description");
-        generateDescriptionInput.onclick = editEventForm_generateDescriptionPressed;
-        generateDescriptionInput.innerHTML = generateDescriptionInput.getAttribute("value");
-        var inputSpan1 = document.createElement("span");
-        inputLI.appendChild(inputSpan1);
-        inputSpan1.setAttribute("class", "required");
-        inputSpan1.innerHTML = " ";
-    }
-
-    var cancelInput = document.createElement("button");
-    inputLI.appendChild(cancelInput);
-    cancelInput.setAttribute("id", "cancel");
-    cancelInput.setAttribute("class", "ebBtn ebBtn_large");
-    cancelInput.setAttribute("type", "submit");
-    cancelInput.setAttribute("value", "Cancel");
-    cancelInput.onclick = editEventForm_cancelPressed;
-    cancelInput.innerHTML = cancelInput.getAttribute("value");
-
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var inputSpan2 = document.createElement("span");
-        inputLI.appendChild(inputSpan2);
-        inputSpan2.setAttribute("class", "required");
-        inputSpan2.innerHTML = " ";
-        var submitInput = document.createElement("button");
-        inputLI.appendChild(submitInput);
-        submitInput.setAttribute("id", "submit");
-        submitInput.setAttribute("class", "ebBtn ebBtn_large");
-        submitInput.setAttribute("type", "submit");
-        submitInput.setAttribute("value", "Submit");
-
-        submitInput.onclick = editEventForm_submitPressed;
-        submitInput.innerHTML = submitInput.getAttribute("value")
-    }
-
-    formParent.appendChild(contentelement);
-    scrollToTop();
-}
-
-function editEventForm_addEventParam(parentTBody, disabled, name, optional, contextSchema, contextSchemas) {
-    var random_suffix = formUtils_generateUUID();
-
-    var paramTR = parentTBody.insertRow(parentTBody.rows.length - 1);
-    paramTR.setAttribute("param_id", random_suffix);
-    paramTR.setAttribute("class", "field-eventparam-tr");
-    if (name == null && contextSchema == null && !disabled) {
-        paramTR.setAttribute("class", "field-eventparam-tr.new field-add-new");
-        $(paramTR).show("fast");
-    }
-    var deleteTD = document.createElement("td");
-    paramTR.appendChild(deleteTD);
-    var deleteDiv = document.createElement("div");
-    deleteTD.appendChild(deleteDiv);
-    if (!disabled) {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete");
-        deleteDiv.onclick = function(event) {
-            $(paramTR).hide("fast", function() {
-                paramTR.parentNode.removeChild(paramTR);
-            });
-        };
-    } else {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete ebIcon_disabled");
-    }
-
-    var nameTD = document.createElement("td");
-    paramTR.appendChild(nameTD);
-    var nameInput = document.createElement("input");
-    nameTD.appendChild(nameInput);
-    nameInput.setAttribute("id", "editEventFormParamName" + "_" + random_suffix);
-    nameInput.setAttribute("type", "text");
-    nameInput.setAttribute("name", "editEventFormParamName" + "_" + random_suffix);
-    nameInput.setAttribute("class", "field-eventparam-name  ebInput ebInput_width_xLong");
-    if (name == null && contextSchema == null && !disabled) {
-        nameInput.setAttribute("class", "field-eventparam-name.new  ebInput ebInput_width_xLong");
-    }
-    nameInput.setAttribute("placeholder", "Parameter Name");
-    if (name) {
-        nameInput.value = name;
-    }
-    nameInput.readOnly = disabled;
-
-    var contextSchemaTD = document.createElement("td");
-    paramTR.appendChild(contextSchemaTD);
-
-    var selectDiv = dropdownList("editEventFormParamContextSchema" + "_" + random_suffix, contextSchemas,
-            contextSchema, disabled, null)
-    contextSchemaTD.appendChild(selectDiv);
-
-    var paramOptionalTD = document.createElement("td");
-    paramOptionalTD.setAttribute("class", "field-checkbox-center");
-    paramTR.appendChild(paramOptionalTD);
-    var paramOptionalInput = document.createElement("input");
-    paramOptionalInput.setAttribute("type", "checkbox");
-    paramOptionalInput.setAttribute("id", "editEventFormParamOptional" + "_" + random_suffix);
-    paramOptionalInput.setAttribute("name", "editEventFormParamOptional" + "_" + random_suffix);
-    paramOptionalInput.setAttribute("class", "field-eventparam-optional");
-    if (name == null && contextSchema == null && !disabled) {
-        paramOptionalInput.setAttribute("class", "field-eventparam-optional.new");
-    }
-    if (optional == true) {
-        paramOptionalInput.checked = true;
-    } else {
-        paramOptionalInput.checked = false;
-    }
-    paramOptionalInput.disabled = disabled;
-    paramOptionalTD.appendChild(paramOptionalInput);
-}
-
-function editEventForm_generateUUIDPressed() {
-    document.getElementById("editEventFormUuidInput").value = formUtils_generateUUID();
-}
-
-function editEventForm_generateDescriptionPressed() {
-    document.getElementById("editEventFormDescriptionTextArea").value = formUtils_generateDescription(document
-            .getElementById("editEventFormNameInput").value,
-            document.getElementById("editEventFormVersionInput").value, document
-                    .getElementById("editEventFormUuidInput").value);
-}
-
-function editEventForm_cancelPressed() {
-    apexUtils_removeElement("editEventFormDiv");
-    eventTab_reset();
-}
-
-function editEventForm_submitPressed() {
-    var createEditOrView = document.getElementById("editEventForm").getAttribute("createEditOrView");
-    if (!createEditOrView || createEditOrView == "" || (createEditOrView != "CREATE" && createEditOrView != "EDIT")) {
-        console.error("Invalid operation \"" + createEditOrView
-                + "\" passed to editEventForm_submitPressed function. Edit failed");
-        apexUtils_removeElement("editEventFormDiv");
-        eventTab_reset();
-        return;
-    }
-
-    var name = document.getElementById('editEventFormNameInput').value;
-    var version = document.getElementById('editEventFormVersionInput').value;
-
-    var eventbean_params = null;
-    // get the event parameters
-    var paramstablerows = document.getElementById("editEventFormParametersTable").rows;
-    if (paramstablerows && paramstablerows.length >= 2) {
-        eventbean_params = new Object();
-        for (var i = 1; i < paramstablerows.length - 1; i++) {
-            var paramTR = paramstablerows[i];
-            if (paramTR && paramTR.getAttribute("param_id")) {
-                var param_id = paramTR.getAttribute("param_id");
-                var paramname = document.getElementById("editEventFormParamName" + "_" + param_id).value;
-                var paramoptional = document.getElementById("editEventFormParamOptional" + "_" + param_id).checked;
-                var param_dt = document.getElementById("editEventFormParamContextSchema" + "_" + param_id
-                        + "_dropdownList").selectedOption;
-                if (eventbean_params[paramname]) {
-                    alert("Event \"" + name + "\" contains more than one Parameter called \"" + paramname + "\"");
-                    return false;
-                }
-                if (param_dt == null) {
-                    alert("Event \"" + name + "\" has no selected Context Item Schema for the Parameter called \""
-                            + paramname + "\"");
-                    return false;
-                }
-                var param_dt_name = param_dt.name;
-                var param_dt_version = param_dt.version;
-                eventbean_params[paramname] = {
-                    "localName" : paramname,
-                    "name" : param_dt_name,
-                    "version" : param_dt_version,
-                    "optional" : paramoptional
-                };
-            }
-        }
-    }
-    // generate an event bean to json-ify and send in rest request
-    var eventbean = {
-        "name" : name,
-        "version" : version,
-        "uuid" : document.getElementById('editEventFormUuidInput').value,
-        "description" : document.getElementById('editEventFormDescriptionTextArea').value,
-        "source" : document.getElementById('editEventFormSourceInput').value,
-        "target" : document.getElementById('editEventFormTargetInput').value,
-        "nameSpace" : document.getElementById('editEventFormNamespaceInput').value,
-        "parameters" : eventbean_params
-    }
-    var jsonString = JSON.stringify(eventbean);
-
-    if (createEditOrView == "CREATE") {
-        var requestURL = restRootURL + "/Event/Create";
-        ajax_post(requestURL, jsonString, function(resultData) {
-            apexUtils_removeElement("editEventFormDiv");
-            eventTab_reset();
-            keyInformationTab_reset()
-        });
-    } else if (createEditOrView == "EDIT") {
-        var requestURL = restRootURL + "/Event/Update";
-        ajax_put(requestURL, jsonString, function(resultData) {
-            apexUtils_removeElement("editEventFormDiv");
-            eventTab_reset();
-            keyInformationTab_reset()
-        });
-    }
-
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexEventTab.js b/client/client-editor/src/main/resources/webapp/js/ApexEventTab.js
deleted file mode 100644
index 0cb0a222b..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexEventTab.js
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function eventTab_reset() {
-    eventTab_deactivate();
-    eventTab_activate();
-}
-
-function eventTab_activate() {
-    eventTab_create();
-    
-    var requestURL = restRootURL + "/Event/Get?name=&version=";
-
-    ajax_get(requestURL, function(data) {
-        $("#eventTableBody").find("tr:gt(0)").remove();
-
-
-        for (var i = 0; i < data.messages.message.length; i++) {
-            var event = JSON.parse(data.messages.message[i]).apexEvent;
-
-            var eventTableRow_tr = document.createElement("tr");
-            var eventid = event.key.name + ":"  + event.key.version;
-            
-            var eventTableRow = 
-                "<td>"                      +
-                eventid                        +
-                "</td>"                     +
-                "<td>"                      +
-                event.nameSpace             +
-                "</td>"                     +
-                "<td>"                      +
-                event.source                +
-                "</td>"                     +
-                "<td>"                      +
-                event.target                +
-                "</td>";
-
-            eventTableRow += "<td><table class='ebTable'><thead><tr><th>Parameter</th><th>Parameter Type/Schema</th><th>Optional</th></tr></thead><tbody>";
-
-            for (var p = 0; p < event.parameter.entry.length; p++) {
-                var fieldEntry = event.parameter.entry[p];
-
-                eventTableRow +=
-                    "<tr><td>"                        +
-                    fieldEntry.key                    +
-                    "</td>"                           +
-                    "<td>"                            +
-                    fieldEntry.value.fieldSchemaKey.name + ":"  + fieldEntry.value.fieldSchemaKey.version +
-                    "<td>"                            +
-                    fieldEntry.value.optional         +
-                    "</td></tr>";
-            }
-
-            eventTableRow += "</tbody></table></td>";
-            
-            eventTableRow_tr.innerHTML = eventTableRow; 
-
-            eventTableRow_tr.addEventListener('contextmenu', rightClickMenu_scopePreserver("eventTabContent", "Event", event.key.name, event.key.version));  
-            
-            $("#eventTableBody").append(eventTableRow_tr);
-        }
-    });
-}
-
-function eventTab_deactivate() {
-    apexUtils_removeElement("eventTabContent");
-}
-
-function eventTab_create() {
-    var eventTab = document.getElementById("eventsTab");
-
-    var eventTabContent = document.getElementById("eventTabContent");
-    if (eventTabContent != null) {
-        return
-    }
-
-    var eventTabContent = document.createElement("eventTabContent");
-    eventTab.appendChild(eventTabContent);
-    eventTabContent.setAttribute("id", "eventTabContent");
-    eventTabContent.addEventListener('contextmenu', rightClickMenu_scopePreserver("eventTabContent", "Event", null, null));  
-
-    var eventTable = createTable("eventTable");
-    eventTabContent.appendChild(eventTable);
-
-    var eventTableHeader = document.createElement("thead");
-    eventTable.appendChild(eventTableHeader);
-    eventTableHeader.setAttribute("id", "eventTableHeader");
-
-    var eventTableHeaderRow = document.createElement("tr");
-    eventTableHeader.appendChild(eventTableHeaderRow);
-    eventTableHeaderRow.setAttribute("id", "eventTableHeaderRow");
-
-    var eventTableKeyHeader = document.createElement("th");
-    eventTableHeaderRow.appendChild(eventTableKeyHeader);
-    eventTableKeyHeader.setAttribute("id", "eventTableKeyHeader");
-    eventTableKeyHeader.appendChild(document.createTextNode("Event"));
-
-    var eventTableNamespaceHeader = document.createElement("th");
-    eventTableHeaderRow.appendChild(eventTableNamespaceHeader);
-    eventTableNamespaceHeader.setAttribute("id", "eventTableNamespaceHeader");
-    eventTableNamespaceHeader.appendChild(document.createTextNode("Name Space"));
-
-    var eventTableSourceHeader = document.createElement("th");
-    eventTableHeaderRow.appendChild(eventTableSourceHeader);
-    eventTableSourceHeader.setAttribute("id", "eventTableSourceHeader");
-    eventTableSourceHeader.appendChild(document.createTextNode("Source"));
-
-    var eventTableTargetHeader = document.createElement("th");
-    eventTableHeaderRow.appendChild(eventTableTargetHeader);
-    eventTableTargetHeader.setAttribute("id", "eventTableTargetHeader");
-    eventTableTargetHeader.appendChild(document.createTextNode("Target"));
-
-    var eventTableParameterHeader = document.createElement("th");
-    eventTableHeaderRow.appendChild(eventTableParameterHeader);
-    eventTableParameterHeader.setAttribute("id", "eventTableParameterHeader");
-    eventTableParameterHeader.appendChild(document.createTextNode("Parameters"));
-
-    var eventTableBody = document.createElement("tbody");
-    eventTable.appendChild(eventTableBody);
-    eventTable.setAttribute("id", "eventTableBody");
-}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexFiles.js b/client/client-editor/src/main/resources/webapp/js/ApexFiles.js
deleted file mode 100644
index 2d868d380..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexFiles.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function files_fileOpen() {
-    $('<input type="file">').on('change', function() {
-        var reader = new FileReader();
-        modelFileName = this.files[0].name;
-        reader.readAsText(this.files[0]);
-
-        reader.onload = function(event) {
-            var requestURL = restRootURL + "/Model/Load";
-            ajax_put(requestURL, event.target.result, function(resultData) {
-                localStorage.setItem("apex_model_loaded", true);
-                var requestURL = restRootURL + "/Model/GetKey";
-                ajax_get(requestURL, function(data) {
-                    var modelKey = JSON.parse(data.messages.message[0]).apexArtifactKey;
-                    pageControl_modelMode(modelKey.name, modelKey.version, modelFileName);
-                });
-            });
-        };
-    }).click();
-}
-
-function files_fileDownload() {
-    var requestURL = restRootURL + "/Model/Download";
-
-    var downloadLink = document.createElement("a");
-    document.body.appendChild(downloadLink);
-    downloadLink.download = modelFileName;
-    downloadLink.href = requestURL;
-    downloadLink.click();
-    document.body.removeChild(downloadLink);
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexFormUtils.js b/client/client-editor/src/main/resources/webapp/js/ApexFormUtils.js
deleted file mode 100644
index d59006efd..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexFormUtils.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function formUtils_generateUUID() { // Public Domain/MIT
-    var d = new Date().getTime();
-    if (typeof performance !== 'undefined' && typeof performance.now === 'function') {
-        d += performance.now(); // use high-precision timer if available
-    }
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-        var r = (d + Math.random() * 16) % 16 | 0;
-        d = Math.floor(d / 16);
-        return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
-    });
-}
-
-function formUtils_generateDescription(name, version, uuid) {
-    if (!name) {
-        name = "null";
-    }
-    if (!version) {
-        version = "null";
-    }
-    if (!uuid) {
-        uuid = "null";
-    }
-
-    var description = "Generated description for a concept called \"" + name + "\" with version \"" + version
-            + "\" and UUID \"" + uuid + "\"";
-    return description;
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexKeyInformationTab.js b/client/client-editor/src/main/resources/webapp/js/ApexKeyInformationTab.js
deleted file mode 100644
index ff92584a7..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexKeyInformationTab.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function keyInformationTab_reset() {
-    keyInformationTab_deactivate();
-    keyInformationTab_activate();
-}
-
-function keyInformationTab_activate() {
-    keyInformationTab_create();
-    
-    var requestURL = restRootURL + "/KeyInformation/Get?name=&version=";
-
-    ajax_get(requestURL, function(data) {
-        $("#keyInformationTableBody").find("tr:gt(0)").remove();
-        
-        for (var i = 0; i < data.messages.message.length; i++) {
-            var keyInfo = JSON.parse(data.messages.message[i]).apexKeyInfo;
-            
-            var keyInfoRow_tr = document.createElement("tr");
-            var keyInfoRow =    
-                    "<td>"                                               +
-                    keyInfo.key.name + ":"  + keyInfo.key.version     +
-                    "</td>"                                           +
-                    "<td><uuid>"                                    +
-                    apexUtils_escapeHtml(keyInfo.UUID)                 +
-                    "</uuid></td>"                                     +
-                    "<td><desc>"                                    +
-                    apexUtils_escapeHtml(keyInfo.description)          +
-                    "</desc></td>";
-            keyInfoRow_tr.innerHTML = keyInfoRow; 
-            // keyInfoRow_tr.addEventListener('contextmenu',
-            // rightClickMenu_scopePreserver("keyInformationTabContent",
-            // "KeyInformation", keyInfo.key.name, keyInfo.key.version));
-            $("#keyInformationTableBody").append(keyInfoRow_tr);
-
-        }
-    });
-}
-
-function keyInformationTab_deactivate() {
-    apexUtils_removeElement("keyInformationTabContent");
-}
-
-function keyInformationTab_create() {
-    var keyInformationTab = document.getElementById("keyInformationTab");
-
-    var keyInformationTabContent = document.getElementById("keyInformationTabContent");
-    if (keyInformationTabContent != null) {
-        return
-    }
-
-    var keyInformationTabContent = document.createElement("keyInformationTabContent");
-    keyInformationTab.appendChild(keyInformationTabContent);
-    keyInformationTabContent.setAttribute("id", "keyInformationTabContent");
-
-    var keyInformationTable = createTable("keyInformationTable");
-    keyInformationTable.oncontextmenu = new Function("return false;")
-    keyInformationTabContent.appendChild(keyInformationTable);
-
-    var keyInformationTableHeader = document.createElement("thead");
-    keyInformationTable.appendChild(keyInformationTableHeader);
-    keyInformationTableHeader.setAttribute("id", "keyInformationTableHeader");
-
-    var keyInformationTableHeaderRow = document.createElement("tr");
-    keyInformationTableHeader.appendChild(keyInformationTableHeaderRow);
-    keyInformationTableHeaderRow.setAttribute("id", "keyInformationTableHeaderRow");
-
-    var keyInformationTableKeyHeader = document.createElement("th");
-    keyInformationTableHeaderRow.appendChild(keyInformationTableKeyHeader);
-    keyInformationTableKeyHeader.setAttribute("id", "keyInformationTableKeyHeader");
-    keyInformationTableKeyHeader.appendChild(document.createTextNode("Key Information"));
-
-    var keyInformationTableUUIDHeader = document.createElement("th");
-    keyInformationTableHeaderRow.appendChild(keyInformationTableUUIDHeader);
-    keyInformationTableUUIDHeader.setAttribute("id", "keyInformationTableUUIDHeader");
-    keyInformationTableUUIDHeader.appendChild(document.createTextNode("UUID"));
-
-    var keyInformationTableDescriptionHeader = document.createElement("th");
-    keyInformationTableHeaderRow.appendChild(keyInformationTableDescriptionHeader);
-    keyInformationTableDescriptionHeader.setAttribute("id", "keyInformationTableDescriptionHeader");
-    keyInformationTableDescriptionHeader.appendChild(document.createTextNode("Description"));
-
-    var keyInformationTableBody = document.createElement("tbody");
-    keyInformationTable.appendChild(keyInformationTableBody);
-    keyInformationTable.setAttribute("id", "keyInformationTableBody");
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexMain.js b/client/client-editor/src/main/resources/webapp/js/ApexMain.js
deleted file mode 100644
index e8ad0de98..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexMain.js
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-var restRootURL = null;
-var modelFileName = null;
-
-$("#menu").fileMenu({
-    slideSpeed : 200
-});
-
-$(document).ready(function() {
-    pageControl_noModelMode();
-    main_getRestRootURL();
-});
-
-$("#menu li").not(".emptyMessage").click(function() {
-    switch (this.id) {
-    case "menuFileNew":
-        newModelForm_activate(document.getElementById("mainArea"));
-        break;
-
-    case "menuFileOpen":
-        files_fileOpen();
-        break;
-
-    case "menuFileDownload":
-        files_fileDownload();
-        break;
-
-    case "menuFileClear":
-        if (confirm("Clear the current model?")) {
-            var requestURL = restRootURL + "/Model/Delete";
-
-            ajax_delete(requestURL, function(data) {
-                localStorage.removeItem("apex_model_loaded");
-                localStorage.removeItem("apex_tab_index");
-                $("#mainTabs").tabs("option", "active", 0);
-                pageControl_noModelMode();
-            });
-        }
-        break;
-
-    case "menuFileNewSession":
-        clearLocalStorage();
-        location.reload();
-        break;
-
-    case "menuFileClose":
-        if (confirm("Close Apex Editor?")) {
-            clearLocalStorage();
-            window.location.href = window.location.href + "close.html";
-        }
-        break;
-
-    case "menuModelAnalyse":
-        modelHandling_analyse();
-        break;
-
-    case "menuModelValidate":
-        modelHandling_validate();
-        break;
-
-    case "menuConceptsContextSchemas":
-        $("#mainTabs").tabs("option", "active", 0);
-        break;
-    case "menuConceptsEvents":
-        $("#mainTabs").tabs("option", "active", 1);
-        break;
-    case "menuConceptsContextAlbums":
-        $("#mainTabs").tabs("option", "active", 2);
-        break;
-    case "menuConceptsTasks":
-        $("#mainTabs").tabs("option", "active", 3);
-        break;
-    case "menuConceptsPolicies":
-        $("#mainTabs").tabs("option", "active", 4);
-        break;
-    case "menuConceptsKeyInformation":
-        $("#mainTabs").tabs("option", "active", 5);
-        break;
-
-    default:
-        break;
-    }
-});
-
-function main_getRestRootURL() {
-    var href = location.protocol
-            + "//"
-            + window.location.hostname
-            + (location.port ? ':' + location.port : '')
-            + (location.pathname.endsWith("/editor/") ? location.pathname.substring(0, location.pathname
-                    .indexOf("editor/")) : location.pathname);
-    var restContext = "apexservices/editor/";
-    if (localStorage.getItem("apex_session")) {
-        restRootURL = href + restContext + localStorage.getItem("apex_session");
-        var requestURL = restRootURL + "/Model/GetKey";
-        ajax_get(requestURL, function(data) {
-            $("#statusMessageTable").append("<tr><td> REST root URL set to: " + restRootURL + "</td></tr>");
-            if (localStorage.getItem("apex_model_loaded")) {
-                var modelKey = JSON.parse(data.messages.message[0]).apexArtifactKey;
-                pageControl_modelMode(modelKey.name, modelKey.version, modelFileName);
-                if (localStorage.getItem("apex_tab_index")) {
-                    $("#mainTabs").tabs({
-                      active: localStorage.getItem("apex_tab_index")
-                    });
-                }
-            }
-        });
-    } else {
-        var createSessionURL = href + restContext + "-1/Session/Create";
-
-        ajax_get(createSessionURL, function(data) {
-            localStorage.setItem("apex_session", data.messages.message[0]);
-            restRootURL = href + restContext + localStorage.getItem("apex_session");
-            $("#statusMessageTable").append("<tr><td> REST root URL set to: " + restRootURL + "</td></tr>");
-        });
-    }
-}
-
-function clearLocalStorage() {
-    localStorage.removeItem("apex_session");
-    localStorage.removeItem("apex_model_loaded");
-    localStorage.removeItem("apex_tab_index");
-}
-
-/* Inline Message */
-var ebInlineMessageHeight = $(".ebInlineMessage").height();
-
-$(".ebInlineMessage").mouseenter(function(e) {
-    e.stopPropagation();
-    $(this).stop();
-    var contentHeight = $(this).children('.ebInlineMessage-contentHolder').height();
-    if (contentHeight > ebInlineMessageHeight) {
-        $(".ebInlineMessage").animate({
-            height : contentHeight + 12
-        }, 200);
-    }
-});
-
-$(".ebInlineMessage").mouseleave(function(e) {
-    e.stopPropagation();
-    $(this).stop();
-    $(".ebInlineMessage").animate({
-        height : ebInlineMessageHeight
-    }, 200);
-});
-
-$(document).ready(function() {
-    $(".content").fadeIn();
-});
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexModelHandling.js b/client/client-editor/src/main/resources/webapp/js/ApexModelHandling.js
deleted file mode 100644
index 92c2df6d1..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexModelHandling.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function modelHandling_analyse() {
-    var requestURL = restRootURL + "/Model/Analyse";
-
-    ajax_get(requestURL, function(data) {
-        resultForm_activate(document.getElementById("mainArea"), "Model Analysis Result", data.messages.message[0]);
-    });
-}
-
-function modelHandling_validate() {
-    var requestURL = restRootURL + "/Model/Validate";
-
-    ajax_getOKOrFail(requestURL, function(data) {
-        var validationResultString = "";
-        for (var i = 1; i < data.messages.message.length; i++) {
-            validationResultString += (data.messages.message[i] + "\n");
-        }
-        resultForm_activate(document.getElementById("mainArea"), "Model Validation Result", validationResultString);
-    });
-}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexNewModelForm.js b/client/client-editor/src/main/resources/webapp/js/ApexNewModelForm.js
deleted file mode 100644
index 6831b5de9..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexNewModelForm.js
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function newModelForm_activate(formParent) {
-    apexUtils_removeElement("newModelFormDiv");
-
-    var contentelement = document.createElement("newModelFormDiv");
-    var formDiv = document.createElement("div");
-    var backgroundDiv = document.createElement("div");
-    backgroundDiv.setAttribute("id", "newModelDivBackground");
-    backgroundDiv.setAttribute("class", "newModelDivBackground");
-
-    backgroundDiv.appendChild(formDiv);
-    contentelement.appendChild(backgroundDiv);
-    formParent.appendChild(contentelement);
-
-    formDiv.setAttribute("id", "newModelFormDiv");
-    formDiv.setAttribute("class", "newModelFormDiv");
-
-    var headingSpan = document.createElement("span");
-    formDiv.appendChild(headingSpan);
-
-    headingSpan.setAttribute("class", "headingSpan");
-    headingSpan.innerHTML = "Model Details";
-
-    var form = document.createElement("newModelForm");
-    formDiv.appendChild(form);
-
-    form.setAttribute("id", "newModelForm");
-    form.setAttribute("class", "form-style-1");
-    form.setAttribute("method", "post");
-
-    var ul = document.createElement("ul");
-    form.appendChild(ul);
-
-    var nameLI = document.createElement("li");
-    form.appendChild(nameLI);
-
-    var nameLabel = document.createElement("label");
-    nameLI.appendChild(nameLabel);
-
-    nameLabel.setAttribute("for", "newModelFormNameInput");
-    nameLabel.innerHTML = "Name: ";
-
-    var nameLabelSpan = document.createElement("span");
-    nameLabel.appendChild(nameLabelSpan);
-
-    nameLabelSpan.setAttribute("class", "required");
-    nameLabelSpan.innerHTML = "*";
-
-    var nameInput = document.createElement("input");
-    nameLI.appendChild(nameInput);
-
-    nameInput.setAttribute("id", "newModelFormNameInput");
-    nameInput.setAttribute("type", "text");
-    nameInput.setAttribute("name", "newModelFormameInput");
-    nameInput.setAttribute("class", "field ebInput ebInput_width_xLong");
-    nameInput.setAttribute("placeholder", "name");
-
-    var versionLI = document.createElement("li");
-    form.appendChild(versionLI);
-
-    var versionLabel = document.createElement("label");
-    versionLI.appendChild(versionLabel);
-
-    versionLabel.setAttribute("for", "newModelFormVersionInput");
-    versionLabel.innerHTML = "Version: ";
-
-    var versionInput = document.createElement("input");
-    versionLI.appendChild(versionInput);
-
-    versionInput.setAttribute("id", "newModelFormVersionInput");
-    versionInput.setAttribute("type", "text");
-    versionInput.setAttribute("name", "newModelFormVersionInput");
-    versionInput.setAttribute("class", "field ebInput ebInput_width_xLong");
-    versionInput.setAttribute("placeholder", "0.0.1");
-
-    var uuidLI = document.createElement("li");
-    form.appendChild(uuidLI);
-
-    var uuidLabel = document.createElement("label");
-    uuidLI.appendChild(uuidLabel);
-
-    uuidLabel.setAttribute("for", "newModelFormUuidInput");
-    uuidLabel.innerHTML = "UUID: ";
-
-    var uuidInput = document.createElement("input");
-    uuidLI.appendChild(uuidInput);
-
-    uuidInput.setAttribute("id", "newModelFormUuidInput");
-    uuidInput.setAttribute("type", "text");
-    uuidInput.setAttribute("name", "newModelFormUuidInput");
-    uuidInput.setAttribute("class", "field-long  ebInput ebInput_width_full");
-    uuidInput.setAttribute("placeholder", "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
-
-    var descriptionLI = document.createElement("li");
-    form.appendChild(descriptionLI);
-
-    var descriptionLabel = document.createElement("label");
-    descriptionLI.appendChild(descriptionLabel);
-    descriptionLabel.setAttribute("for", "newModelFormDescriptionTextArea");
-    descriptionLabel.innerHTML = "Description: ";
-
-    var descriptionTextArea = document.createElement("textarea");
-    descriptionLI.appendChild(descriptionTextArea);
-
-    descriptionTextArea.setAttribute("id", "newModelFormDescriptionTextArea");
-    descriptionTextArea.setAttribute("name", "newModelFormDescriptionTextArea");
-    descriptionTextArea.setAttribute("class", "field-long field-textarea ebTextArea ebTextArea_width_full");
-
-    var inputLI = document.createElement("li");
-    form.appendChild(inputLI);
-
-    var generateUUIDInput = document.createElement("input");
-    inputLI.appendChild(generateUUIDInput);
-
-    generateUUIDInput.setAttribute("id", "generateUUID");
-    generateUUIDInput.setAttribute("class", "button ebBtn");
-    generateUUIDInput.setAttribute("type", "submit");
-    generateUUIDInput.setAttribute("value", "Generate UUID");
-
-    generateUUIDInput.onclick = newModelForm_generateUUIDPressed;
-
-    var inputSpan0 = document.createElement("span");
-    inputLI.appendChild(inputSpan0);
-
-    inputSpan0.setAttribute("class", "required");
-    inputSpan0.innerHTML = " ";
-
-    var generateDescriptionInput = document.createElement("input");
-    inputLI.appendChild(generateDescriptionInput);
-
-    generateDescriptionInput.setAttribute("id", "generateDescription");
-    generateDescriptionInput.setAttribute("class", "button ebBtn");
-    generateDescriptionInput.setAttribute("type", "submit");
-    generateDescriptionInput.setAttribute("value", "Generate Description");
-
-    generateDescriptionInput.onclick = newModelForm_generateDescriptionPressed;
-
-    var inputSpan1 = document.createElement("span");
-    inputLI.appendChild(inputSpan1);
-
-    inputSpan1.setAttribute("class", "required");
-    inputSpan1.innerHTML = " ";
-
-    var cancelInput = document.createElement("input");
-    inputLI.appendChild(cancelInput);
-
-    cancelInput.setAttribute("id", "generateDescription");
-    cancelInput.setAttribute("class", "button ebBtn");
-    cancelInput.setAttribute("type", "submit");
-    cancelInput.setAttribute("value", "Cancel");
-
-    cancelInput.onclick = newModelForm_cancelPressed;
-
-    var inputSpan2 = document.createElement("span");
-    inputLI.appendChild(inputSpan2);
-
-    inputSpan2.setAttribute("class", "required");
-    inputSpan2.innerHTML = " ";
-
-    var submitInput = document.createElement("input");
-    inputLI.appendChild(submitInput);
-
-    submitInput.setAttribute("id", "submit");
-    submitInput.setAttribute("class", "button ebBtn");
-    submitInput.setAttribute("type", "submit");
-    submitInput.setAttribute("value", "Submit");
-
-    submitInput.onclick = newModelForm_submitPressed;
-}
-
-function newModelForm_generateUUIDPressed() {
-    document.getElementById("newModelFormUuidInput").value = formUtils_generateUUID();
-}
-
-function newModelForm_generateDescriptionPressed() {
-    document.getElementById("newModelFormDescriptionTextArea").value = formUtils_generateDescription(document
-            .getElementById("newModelFormNameInput").value, document.getElementById("newModelFormVersionInput").value,
-            document.getElementById("newModelFormUuidInput").value);
-}
-
-function newModelForm_cancelPressed() {
-    apexUtils_removeElement("newModelDivBackground");
-}
-
-function newModelForm_submitPressed() {
-    jsonString = JSON.stringify({
-        "name" : $('#newModelFormNameInput').val(),
-        "version" : $('#newModelFormVersionInput').val(),
-        "uuid" : $('#newModelFormUuidInput').val(),
-        "description" : $('#newModelFormDescriptionTextArea').val()
-    });
-
-    var requestURL = restRootURL + "/Model/Create";
-
-    ajax_post(requestURL, jsonString, function(resultData) {
-        apexUtils_removeElement("newModelDivBackground");
-
-        var requestURL = restRootURL + "/Model/GetKey";
-
-        ajax_get(requestURL, function(data) {
-            var modelKey = JSON.parse(data.messages.message[0]).apexArtifactKey;
-            modelFileName = modelKey.name + ".json";
-            pageControl_modelMode(modelKey.name, modelKey.version, modelFileName);
-        });
-        keyInformationTab_reset()
-    });
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexPageControl.js b/client/client-editor/src/main/resources/webapp/js/ApexPageControl.js
deleted file mode 100644
index 4904f306f..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexPageControl.js
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function pageControl_modelMode(name, version, fileName) {
-    $('#modelName').html(name);
-    $('#modelVersion').html(version);
-    $('#modelFileName').html(fileName ? fileName : "N/A");
-
-    $("#menuFileNew").addClass("disabled");
-    $("#menuFileOpen").addClass("disabled");
-    $("#menuFileDownload").removeClass("disabled");
-    $("#menuFileClear").removeClass("disabled");
-    $("#menuModelAnalyse").removeClass("disabled");
-    $("#menuModelValidate").removeClass("disabled");
-    $("#menuModelCompare").removeClass("disabled");
-    $("#menuModelSplit").removeClass("disabled");
-    $("#menuModelMerge").removeClass("disabled");
-    $("#menuConceptsContextSchemas").removeClass("disabled");
-    $("#menuConceptsEvents").removeClass("disabled");
-    $("#menuConceptsContextAlbums").removeClass("disabled");
-    $("#menuConceptsTasks").removeClass("disabled");
-    $("#menuConceptsPolicies").removeClass("disabled");
-    $("#menuConceptsKeyInformation").removeClass("disabled");
-
-    $(".modelTag").show("slide", {
-        direction : "left"
-    }, 200);
-
-    $("#mainTabs").tabs({
-        classes : {
-            "ui-tabs-tab" : "ui-tabs-tab-custom",
-            "ui-tabs-active" : "ui-tabs-active-custom",
-            "ui-tabs-anchor" : "ui-tabs-anchor-custom"
-        },
-        disabled : false,
-        activate : function(event, ui) {
-            localStorage.setItem("apex_tab_index", ui.newTab.index());
-        }
-    });
-
-    contextSchemaTab_activate();
-    eventTab_activate();
-    contextAlbumTab_activate();
-    taskTab_activate();
-    policyTab_activate();
-    keyInformationTab_activate();
-    showPlaceholder(false);
-}
-
-function pageControl_noModelMode() {
-    $(".modelTag").hide("slide", {
-        direction : "left"
-    }, 200);
-
-    $('#modelName').html("N/A");
-    $('#modelVersion').html("N/A");
-    $('#modelFileName').html("N/A");
-
-    $("#menuFileNew").removeClass("disabled");
-    $("#menuFileOpen").removeClass("disabled");
-    $("#menuFileDownload").addClass("disabled");
-    $("#menuFileClear").addClass("disabled");
-    $("#menuModelAnalyse").addClass("disabled");
-    $("#menuModelValidate").addClass("disabled");
-    $("#menuModelCompare").addClass("disabled");
-    $("#menuModelSplit").addClass("disabled");
-    $("#menuModelMerge").addClass("disabled");
-    $("#menuConceptsContextSchemas").addClass("disabled");
-    $("#menuConceptsEvents").addClass("disabled");
-    $("#menuConceptsContextAlbums").addClass("disabled");
-    $("#menuConceptsTasks").addClass("disabled");
-    $("#menuConceptsPolicies").addClass("disabled");
-    $("#menuConceptsKeyInformation").addClass("disabled");
-
-    contextSchemaTab_deactivate();
-    eventTab_deactivate();
-    contextAlbumTab_deactivate();
-    taskTab_deactivate();
-    policyTab_deactivate();
-    keyInformationTab_deactivate();
-
-    $("#mainTabs").tabs({
-        classes : {
-            "ui-tabs-tab" : "ui-tabs-tab-custom",
-            "ui-tabs-active" : "ui-tabs-active-custom",
-            "ui-tabs-anchor" : "ui-tabs-anchor-custom"
-        },
-        disabled : [ 0, 1, 2, 3, 4, 5 ]
-    });
-    showPlaceholder(true);
-}
-
-function pageControl_busyMode() {
-    $("#menuFile").addClass("disabled");
-    $("#menuFileNew").addClass("disabled");
-    $("#menuFileOpen").addClass("disabled");
-    $("#menuFileDownload").addClass("disabled");
-    $("#menuFileClear").addClass("disabled");
-    $("#menuModelAnalyse").addClass("disabled");
-    $("#menuModelValidate").addClass("disabled");
-    $("#menuModelCompare").addClass("disabled");
-    $("#menuModelSplit").addClass("disabled");
-    $("#menuModelMerge").addClass("disabled");
-    $("#menuConceptsContextSchemas").addClass("disabled");
-    $("#menuConceptsEvents").addClass("disabled");
-    $("#menuConceptsContextAlbums").addClass("disabled");
-    $("#menuConceptsTasks").addClass("disabled");
-    $("#menuConceptsPolicies").addClass("disabled");
-    $("#menuConceptsKeyInformation").addClass("disabled");
-
-    $("#mainTabs").tabs({
-        classes : {
-            "ui-tabs-tab" : "ui-tabs-tab-custom",
-            "ui-tabs-active" : "ui-tabs-active-custom",
-            "ui-tabs-anchor" : "ui-tabs-anchor-custom"
-        },
-        disabled : false
-    });
-
-    contextSchemaTab_activate();
-    eventTab_activate();
-    contextAlbumTab_activate();
-    taskTab_activate();
-    policyTab_activate();
-    keyInformationTab_activate();
-    showPlaceholder(false);
-}
-
-function pageControl_readyMode() {
-    $("#menuFile").removeClass("disabled");
-    $("#menuFileNew").removeClass("disabled");
-    $("#menuFileOpen").removeClass("disabled");
-    $("#menuFileDownload").removeClass("disabled");
-    $("#menuFileClear").removeClass("disabled");
-    $("#menuModelAnalyse").removeClass("disabled");
-    $("#menuModelValidate").removeClass("disabled");
-    $("#menuModelCompare").removeClass("disabled");
-    $("#menuModelSplit").removeClass("disabled");
-    $("#menuModelMerge").removeClass("disabled");
-    $("#menuConceptsContextSchemas").removeClass("disabled");
-    $("#menuConceptsEvents").removeClass("disabled");
-    $("#menuConceptsContextAlbums").removeClass("disabled");
-    $("#menuConceptsTasks").removeClass("disabled");
-    $("#menuConceptsPolicies").removeClass("disabled");
-    $("#menuConceptsKeyInformation").removeClass("disabled");
-
-    contextSchemaTab_deactivate();
-    eventTab_deactivate();
-    contextAlbumTab_deactivate();
-    taskTab_deactivate();
-    policyTab_deactivate();
-    keyInformationTab_deactivate();
-
-    $("#mainTabs").tabs({
-        classes : {
-            "ui-tabs-tab" : "ui-tabs-tab-custom",
-            "ui-tabs-active" : "ui-tabs-active-custom",
-            "ui-tabs-anchor" : "ui-tabs-anchor-custom"
-        },
-        disabled : [ 0, 1, 2, 3, 4, 5 ]
-    });
-    showPlaceholder(true);
-}
-
-function pageControl_successStatus(data) {
-    $('#statusString').html(data.result);
-    $("#statusMessageTable").empty();
-
-    if (data.ok) {
-        $('#statusString').css("color", "green");
-        $('#ebInlineMessage-iconHolder-icon').attr("class", "ebIcon ebIcon_big ebIcon_tick");
-    } else {
-        $('#statusString').css("color", "red");
-        $('#ebInlineMessage-iconHolder-icon').attr("class", "ebIcon ebIcon_big ebIcon_error");
-        for (var i = 0; i < data.messages.message.length; i++) {
-            $("#statusMessageTable").append("<tr><td>" + data.messages.message[i] + "</td></tr>");
-        }
-        // A session with session ID "0" does not exist
-        var sessionDoesNotExistStringStart = "A session with session ID ";
-        var sessionDoesNotExistStringEnd = " does not exist";
-        if (data.content.indexOf(sessionDoesNotExistStringStart) !== -1
-                && data.content.indexOf(sessionDoesNotExistStringEnd) !== -1) {
-            clearLocalStorage();
-            location.reload();
-        }
-        throw "REST call returned an error\n" + data;
-    }
-}
-
-function pageControl_status(data) {
-    $('#statusString').html(data.result);
-    $("#statusMessageTable").empty();
-
-    if (data.ok) {
-        $('#statusString').css("color", "green");
-        $('#ebInlineMessage-iconHolder-icon').attr("class", "ebIcon ebIcon_big ebIcon_tick");
-    } else {
-        $('#statusString').css("color", "red");
-        $('#ebInlineMessage-iconHolder-icon').attr("class", "ebIcon ebIcon_big ebIcon_error");
-    }
-}
-
-function pageControl_restError(requestURL, jqXHR, textStatus, errorThrown) {
-    $('#statusString').html("REST_ERROR");
-    $('#statusString').css("color", "red");
-    $('#ebInlineMessage-iconHolder-icon').attr("class", "ebIcon ebIcon_big ebIcon_error");
-
-    $("#statusMessageTable").empty();
-    $("#statusMessageTable").append(
-            "<tr><td>request \"" + requestURL + "\" returned  \"" + textStatus + "\" " + jqXHR.status + " \""
-                    + errorThrown + "\"</td></tr>");
-
-}
-
-function pageControl_recursiveDisable(el, disableValue, visibleValue) {
-    try {
-        el.readOnly = disableValue;
-        el.style.visibility = (visibleValue ? "visible" : "hidden");
-    } catch (E) {
-    }
-
-    if (el.childNodes && el.childNodes.length > 0) {
-        for (var i = 0; i < el.childNodes.length; i++) {
-            recursiveDisable(el.childNodes[i], disableValue, visibleValue);
-        }
-    }
-}
-
-function showPlaceholder(show) {
-    if (show) {
-        $(".placeholder").show();
-    } else {
-        $(".placeholder").hide();
-    }
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js b/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js
deleted file mode 100644
index 93c672cb6..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm.js
+++ /dev/null
@@ -1,802 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function editPolicyForm_createPolicy(formParent) {
-    editPolicyForm_editPolicy_inner(formParent, null, "CREATE");
-}
-
-function editPolicyForm_deletePolicy(parent, name, version) {
-    var message = "Are you sure you want to delete Policy \"" + name + ":" + version + "\"?";
-    if (apexUtils_areYouSure(message)) {
-        var requestURL = restRootURL + "/Policy/Delete?name=" + name + "&version=" + version;
-        ajax_delete(requestURL, function(data) {
-            apexUtils_removeElement("editPolicyFormDiv");
-            policyTab_reset();
-            keyInformationTab_reset()
-        });
-    }
-}
-
-function editPolicyForm_viewPolicy(formParent, name, version) {
-    // get the policy
-    var requestURL = restRootURL + "/Policy/Get?name=" + name + "&version=" + version;
-    ajax_getWithKeyInfo(requestURL, "apexPolicy", function(policy) {
-        editPolicyForm_editPolicy_inner(formParent, policy, "VIEW");
-    }, "policyKey");
-}
-
-function editPolicyForm_editPolicy(formParent, name, version) {
-    // get the policy
-    var requestURL = restRootURL + "/Policy/Get?name=" + name + "&version=" + version;
-    ajax_getWithKeyInfo(requestURL, "apexPolicy", function(policy) {
-        editPolicyForm_editPolicy_inner(formParent, policy, "EDIT");
-    }, "policyKey");
-}
-
-function editPolicyForm_editPolicy_inner(formParent, policy, viewOrEdit) {
-    // Get all contextSchemas too
-    requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
-    var contextSchemas = new Array();
-    ajax_get(requestURL, function(data2) {
-        for (var i = 0; i < data2.messages.message.length; i++) {
-            var contextSchema = JSON.parse(data2.messages.message[i]).apexContextSchema;
-            contextSchemas.push({
-                "name" : contextSchema.key.name,
-                "version" : contextSchema.key.version,
-                "displaytext" : contextSchema.key.name + ":" + contextSchema.key.version,
-                "contextSchema" : contextSchema
-            });
-        }
-        // Get all tasks
-        requestURL = restRootURL + "/Task/Get?name=&version=";
-        var tasks = new Array();
-        ajax_get(requestURL, function(data3) {
-            for (var j = 0; j < data3.messages.message.length; j++) {
-                var task = JSON.parse(data3.messages.message[j]).apexTask;
-                tasks.push({
-                    "name" : task.key.name,
-                    "version" : task.key.version,
-                    "displaytext" : task.key.name + ":" + task.key.version,
-                    "task" : task
-                });
-            }
-            // Get all ContextAlbums
-            requestURL = restRootURL + "/ContextAlbum/Get?name=&version=";
-            var albums = new Array();
-            ajax_get(requestURL, function(data4) {
-                for (var k = 0; k < data4.messages.message.length; k++) {
-                    var album = JSON.parse(data4.messages.message[k]).apexContextAlbum;
-                    albums.push({
-                        "name" : album.key.name,
-                        "version" : album.key.version,
-                        "displaytext" : album.key.name + ":" + album.key.version,
-                        "album" : album
-                    });
-                }
-                // Get all Events
-                requestURL = restRootURL + "/Event/Get?name=&version=";
-                var events = new Array();
-                ajax_get(requestURL, function(data5) {
-                    for (var m = 0; m < data5.messages.message.length; m++) {
-                        var event = JSON.parse(data5.messages.message[m]).apexEvent;
-                        events.push({
-                            "name" : event.key.name,
-                            "version" : event.key.version,
-                            "displaytext" : event.key.name + ":" + event.key.version,
-                            "event" : event
-                        });
-                    }
-                    editPolicyForm_activate(formParent, viewOrEdit, policy, tasks, events, albums, contextSchemas);
-                });
-            });
-        });
-    });
-}
-
-function editPolicyForm_activate(parent, operation, policy, tasks, events, contextAlbums, contextItemSchemas) {
-    apexUtils_removeElement("editPolicyFormDiv");
-    var formParent = document.getElementById(parent);
-    apexUtils_emptyElement(parent);
-
-    var isedit = false;
-    var createEditOrView = "";
-
-    if (!operation) {
-        console.warn("No operation specified for PolicyForm form")
-    } else {
-        createEditOrView = operation.toUpperCase();
-    }
-
-    if (createEditOrView == "CREATE") {
-        isedit = true;
-    } else if (createEditOrView == "EDIT" || createEditOrView == "VIEW") {
-        if (createEditOrView == "EDIT") {
-            isedit = true;
-        }
-
-        if (!policy) {
-            console.warn("Invalid value (\"" + policy + "\") passed as a value for \"policy\" for PolicyForm form.");
-        } else {
-            if (!policy.policyKey || !policy.policyKey.name || policy.policyKey.name == "") {
-                console.warn("Invalid value (\"" + policy.policyKey.name
-                        + "\") passed as a value for \"name\" for PolicyForm form.");
-            }
-            if (!policy.policyKey || !policy.policyKey.version || policy.policyKey.version == "") {
-                console.warn("Invalid value (\"" + policy.policyKey.version
-                        + "\") passed as a value for \"version\" for PolicyForm form.");
-            }
-            if (!policy.uuid || policy.uuid == "") {
-                console.warn("Invalid value (\"" + policy.uuid
-                        + "\") passed as a value for \"uuid\" for PolicyForm form.");
-            }
-        }
-    } else {
-        console.warn("Invalid operation (\"" + operation
-                + "\") specified for PolicyForm form. Only \"Create\", \"Edit\" and \"View\" operations are supported");
-    }
-
-    var contentelement = document.createElement("editPolicyFormDiv");
-    var formDiv = document.createElement("div");
-    contentelement.appendChild(formDiv);
-    formDiv.setAttribute("id", "editPolicyFormDiv");
-    formDiv.setAttribute("class", "editPolicyFormDiv");
-
-    var headingSpan = document.createElement("h2");
-    formDiv.appendChild(headingSpan);
-    headingSpan.innerHTML = "Policy Editor";
-
-    var form = document.createElement("editPolicyForm");
-    formDiv.appendChild(form);
-
-    form.setAttribute("id", "editPolicyForm");
-    form.setAttribute("class", "form-style-1");
-    form.setAttribute("method", "post");
-    form.setAttribute("createEditOrView", createEditOrView);
-
-    var formul = document.createElement("ul");
-    form.appendChild(formul);
-
-    // name
-    var nameLI = document.createElement("li");
-    formul.appendChild(nameLI);
-    var nameLabel = document.createElement("label");
-    nameLI.appendChild(nameLabel);
-    nameLabel.setAttribute("for", "editPolicyFormNameInput");
-    nameLabel.innerHTML = "Name: ";
-    var nameLabelSpan = document.createElement("span");
-    nameLabel.appendChild(nameLabelSpan);
-    nameLabelSpan.setAttribute("class", "required");
-    nameLabelSpan.innerHTML = "*";
-    var nameInput = document.createElement("input");
-    nameLI.appendChild(nameInput);
-    nameInput.setAttribute("id", "editPolicyFormNameInput");
-    nameInput.setAttribute("type", "text");
-    nameInput.setAttribute("name", "editPolicyFormNameInput");
-    nameInput.setAttribute("class", "field ebInput");
-    nameInput.setAttribute("placeholder", "name");
-    if (policy != null && policy.policyKey != null && policy.policyKey.name != null) {
-        nameInput.value = policy.policyKey.name;
-    }
-    if (createEditOrView != "CREATE") {
-        nameInput.readOnly = true;
-    }
-
-    // version
-    var versionLI = document.createElement("li");
-    formul.appendChild(versionLI);
-    var versionLabel = document.createElement("label");
-    versionLI.appendChild(versionLabel);
-    versionLabel.setAttribute("for", "editPolicyFormVersionInput");
-    versionLabel.innerHTML = "Version: ";
-    var versionInput = document.createElement("input");
-    versionLI.appendChild(versionInput);
-    versionInput.setAttribute("id", "editPolicyFormVersionInput");
-    versionInput.setAttribute("type", "text");
-    versionInput.setAttribute("name", "editPolicyFormVersionInput");
-    versionInput.setAttribute("class", "field ebInput");
-    versionInput.setAttribute("placeholder", "0.0.1");
-    if (policy != null && policy.policyKey != null && policy.policyKey.version != null) {
-        versionInput.value = policy.policyKey.version;
-    }
-    if (createEditOrView != "CREATE") {
-        versionInput.readOnly = true;
-    }
-
-    // uuid
-    var uuidLI = document.createElement("li");
-    formul.appendChild(uuidLI);
-    var uuidLabel = document.createElement("label");
-    uuidLI.appendChild(uuidLabel);
-    uuidLabel.setAttribute("for", "editPolicyFormUuidInput");
-    uuidLabel.innerHTML = "UUID: ";
-    var uuidInput = document.createElement("input");
-    uuidLI.appendChild(uuidInput);
-    uuidInput.setAttribute("id", "editPolicyFormUuidInput");
-    uuidInput.setAttribute("type", "text");
-    uuidInput.setAttribute("name", "editPolicyFormUuidInput");
-    uuidInput.setAttribute("class", "field-long ebInput ebInput_width_full");
-    uuidInput.setAttribute("placeholder", "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
-    if (policy != null && policy.uuid != null) {
-        uuidInput.value = policy.uuid;
-    }
-    if (createEditOrView != "CREATE") {
-        uuidInput.readOnly = true;
-    }
-
-    var edit_disabled = (createEditOrView != "CREATE" && createEditOrView != "EDIT");
-
-    // description
-    var descriptionLI = document.createElement("li");
-    formul.appendChild(descriptionLI);
-    var descriptionLabel = document.createElement("label");
-    descriptionLI.appendChild(descriptionLabel);
-    descriptionLabel.setAttribute("for", "editPolicyFormDescriptionTextArea");
-    descriptionLabel.innerHTML = "Description: ";
-    var descriptionTextArea = document.createElement("textarea");
-    descriptionLI.appendChild(descriptionTextArea);
-    descriptionTextArea.setAttribute("id", "editPolicyFormDescriptionTextArea");
-    descriptionTextArea.setAttribute("name", "editPolicyFormDescriptionTextArea");
-    descriptionTextArea.setAttribute("class", "field-long ebTextArea ebTextArea_width_full");
-    if (policy != null && policy.description != null) {
-        descriptionTextArea.value = policy.description;
-    }
-    descriptionTextArea.readOnly = edit_disabled;
-
-    // template type
-    var templateTypeLI = document.createElement("li");
-    formul.appendChild(templateTypeLI);
-    var templateTypeLabel = document.createElement("label");
-    templateTypeLI.appendChild(templateTypeLabel);
-    templateTypeLabel.setAttribute("for", "editEventFormTemplateTypeInput");
-    templateTypeLabel.innerHTML = "Policy Type / Flavour: ";
-    var templateTypeInput = document.createElement("input");
-    templateTypeLI.appendChild(templateTypeInput);
-    templateTypeInput.setAttribute("id", "editEventFormTemplateTypeInput");
-    templateTypeInput.setAttribute("type", "text");
-    templateTypeInput.setAttribute("name", "editEventFormTemplateTypeInput");
-    templateTypeInput.setAttribute("class", "field-policyTemplateType ebInput");
-    templateTypeInput.setAttribute("placeholder", "FREEFORM");
-    if (policy != null && policy.template != null) {
-        templateTypeInput.value = policy.template;
-    } else {
-        templateTypeInput.value = "FREEFORM";
-    }
-    if (createEditOrView != "CREATE" && createEditOrView != "EDIT") {
-        templateTypeInput.readOnly = true;
-    }
-
-    // first state
-    var firstStateLI = document.createElement("li");
-    formul.appendChild(firstStateLI);
-    var firstStateLabel = document.createElement("label");
-    firstStateLI.appendChild(firstStateLabel);
-    firstStateLabel.setAttribute("for", "editEventFormSelectFirstState_dropdownList");
-    firstStateLabel.innerHTML = "First State: ";
-    var firststateoptions = new Array();
-    var firststateselected = null;
-    if (policy != null && policy.state != null) {
-        for (i = 0; i < policy.state.entry.length; i++) {
-            if (policy.state.entry[i] != null && policy.state.entry[i].key != null) {
-                var statename = policy.state.entry[i].key;
-                firststateoptions.push({
-                    "name" : statename,
-                    "displaytext" : statename
-                });
-            }
-        }
-    }
-    if (policy != null && policy.firstState != null && policy.firstState != "") {
-        firststateselected = {
-            "name" : policy.firstState,
-            "displaytext" : policy.firstState
-        }
-    }
-    var firstStateSelectDiv = dropdownList("editEventFormSelectFirstState", firststateoptions, firststateselected,
-            (createEditOrView != "CREATE" && createEditOrView != "EDIT"), function() {
-                return editPolicyForm_updateTriggerEventOptions(events);
-            }, function() {
-                return editPolicyForm_getStateOptions();
-            });
-    firstStateLI.appendChild(firstStateSelectDiv);
-
-    // Trigger event
-    var triggerLI = document.createElement("li");
-    formul.appendChild(triggerLI);
-    var triggerLabel = document.createElement("label");
-    triggerLI.appendChild(triggerLabel);
-    triggerLabel.setAttribute("for", "editEventFormSelectTrigger_dropdownList");
-    triggerLabel.innerHTML = "Policy Trigger Event: ";
-    var triggerevent = null;
-    if (policy != null && policy.firstState != null && policy.firstState != "" && policy.state != null) {
-        for (i = 0; i < policy.state.entry.length; i++) {
-            if (policy.state.entry[i] != null && policy.state.entry[i].key != null) {
-                var statename = policy.state.entry[i].key;
-                var state = policy.state.entry[i].value;
-                if (statename != null && statename == policy.firstState) {
-                    triggerevent = {
-                        "name" : state.trigger.name,
-                        "version" : state.trigger.version,
-                        "displaytext" : state.trigger.name + ":" + state.trigger.version
-                    };
-                }
-            }
-        }
-    }
-    // var triggerSelectDiv = dropdownList("editEventFormSelectTrigger", events,
-    // triggerevent, true, null); // ewatkmi: replaced dropdown with label
-    var triggerSelectDiv = document.createElement("label");
-    triggerSelectDiv.setAttribute("class", "policy-trigger-event");
-    triggerSelectDiv.setAttribute("id", "editEventFormSelectTrigger_dropdownList");
-    triggerSelectDiv.innerHTML = triggerevent ? triggerevent.displaytext : "No Event Selected";
-    triggerLI.appendChild(triggerSelectDiv);
-    var triggerPeriodicEventCheckbox = document.createElement("input");
-    triggerPeriodicEventCheckbox.setAttribute("type", "checkbox");
-    triggerPeriodicEventCheckbox.setAttribute("id", "periodicEventsCheckbox");
-    triggerPeriodicEventCheckbox.setAttribute("class", "field-checkbox-center periodic-events-checkbox");
-    triggerPeriodicEventCheckbox.disabled = createEditOrView != "EDIT";
-    triggerPeriodicEventCheckbox.onclick = function() {
-        var firstState = document.getElementById("editEventFormSelectFirstState_dropdownList_display").innerHTML;
-        var firstStateDropdown = document.getElementById("editPolicyFormTrigger_" + firstState + "_dropdownList");
-        if ($(triggerPeriodicEventCheckbox).is(":checked")) {
-            var periodicEvent = undefined;
-            var tmpEvents = $.merge([], events);
-            for ( var e in events) {
-                if (events[e].name.indexOf("PeriodicEvent") !== -1) {
-                    periodicEvent = events[e];
-                    break;
-                }
-            }
-            if (!periodicEvent) {
-                periodicEvent = {
-                    name : "PeriodicEvent",
-                    version : "0.0.1",
-                    displaytext : "PeriodicEvent:0.0.1",
-                    event : {
-                        description : "",
-                        key : {
-                            name : "PeriodicEvent",
-                            version : "0.0.1"
-                        },
-                        nameSpace : "org.onap.policy.apex.domains.aadm.events",
-                        parameter : {
-                            entry : [ {
-                                key : "PERIODIC_EVENT_COUNT",
-                                value : {
-                                    key : "PERIODIC_EVENT_COUNT",
-                                    optional : false,
-                                    fieldSchemaKey : {
-                                        name : "PeriodicEventCount",
-                                        version : "0.0.1"
-                                    }
-                                }
-                            } ]
-                        },
-                        source : "System",
-                        target : "Apex",
-                        uuid : "44236da1-3d47-4988-8033-b6fee9d6a0f4"
-                    },
-                };
-                tmpEvents.push(periodicEvent);
-            }
-
-            dropdownList_ChangeOptions(firstStateDropdown, tmpEvents, periodicEvent, false);
-            editPolicyForm_updateTriggerEventOptions(tmpEvents);
-        } else {
-            dropdownList_ChangeOptions(firstStateDropdown, events, events[0], false);
-            editPolicyForm_updateTriggerEventOptions(events);
-        }
-    }
-
-    triggerLI.appendChild(triggerPeriodicEventCheckbox);
-
-    triggerPeriodicEventLabel = document.createElement("label");
-    triggerPeriodicEventLabel.setAttribute("class", "periodic-events-label");
-    triggerPeriodicEventLabel.innerHTML = "is Periodic Event";
-    triggerLI.appendChild(triggerPeriodicEventLabel);
-
-    // states
-    var statesLI = document.createElement("li");
-    formul.appendChild(statesLI);
-    var statesLabel = document.createElement("label");
-    statesLI.appendChild(statesLabel);
-    statesLabel.setAttribute("for", "editEventFormStates");
-    statesLabel.innerHTML = "States: ";
-    var statesUL = document.createElement("ul");
-    statesUL.setAttribute("id", "editEventFormStates");
-    statesLI.appendChild(statesUL);
-    if (policy && policy.state) {
-        var states = policy.state.entry;
-        for ( var s in states) {
-            var state = states[s];
-            if (state.key == policy.firstState) {
-                states.splice(s, 1);
-                states.unshift(state);
-                break;
-            }
-        }
-        for (i = 0; i < policy.state.entry.length; i++) {
-            stateEntry = policy.state.entry[i];
-            var statename = stateEntry.key;
-            var state = stateEntry.value;
-            var stateLI = editPolicyForm_addState(statename, state, createEditOrView, policy, tasks, events,
-                    contextAlbums, contextItemSchemas);
-            statesUL.appendChild(stateLI);
-        }
-    }
-
-    // add new state
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var newStateLI = document.createElement("li");
-        statesUL.appendChild(newStateLI);
-        var newStateLabel = document.createElement("label");
-        newStateLI.appendChild(newStateLabel);
-        newStateLabel.setAttribute("for", "editPolicyFormStateDiv_");
-        newStateLabel.innerHTML = "Add a new State: ";
-        var newStDiv = document.createElement("div");
-        newStateLI.appendChild(newStDiv);
-        newStDiv.setAttribute("id", "editPolicyFormStateDiv_");
-        newStDiv.setAttribute("class", "editPolicyFormStateDiv");
-        var newStateInput = document.createElement("input");
-        newStDiv.appendChild(newStateInput);
-        newStateInput.setAttribute("id", "editEventFormNewStateInput");
-        newStateInput.setAttribute("type", "text");
-        newStateInput.setAttribute("name", "editEventFormTemplateTypeInput");
-        newStateInput.setAttribute("class", "field-policyTemplateType ebInput ebInput_width_xLong");
-        newStateInput.setAttribute("placeholder", "Name for new State ... ");
-        var addState = document.createElement("button");
-        newStDiv.appendChild(addState);
-        addState.setAttribute("id", "addStateButton");
-        addState.setAttribute("class", "ebBtn");
-        addState.setAttribute("type", "submit");
-        addState.setAttribute("value", "Add a new State");
-        addState.style["margin-left"] = "10px";
-        addState.onclick = function() {
-            return editPolicyForm_addNewState(statesUL, createEditOrView, policy, tasks, events, contextAlbums,
-                    contextItemSchemas);
-        };
-        addState.innerHTML = addState.getAttribute("value");
-    }
-
-    // buttons
-    var inputLI = document.createElement("li");
-    formul.appendChild(inputLI);
-    if (createEditOrView == "CREATE") {
-        var generateUUIDInput = document.createElement("button");
-        inputLI.appendChild(generateUUIDInput);
-        generateUUIDInput.setAttribute("id", "generateUUID");
-        generateUUIDInput.setAttribute("class", "ebBtn ebBtn_large");
-        generateUUIDInput.setAttribute("type", "submit");
-        generateUUIDInput.setAttribute("value", "Generate UUID");
-        generateUUIDInput.onclick = editPolicyForm_generateUUIDPressed;
-        generateUUIDInput.innerHTML = generateUUIDInput.getAttribute("value");
-
-        var inputSpan0 = document.createElement("span");
-        inputLI.appendChild(inputSpan0);
-        inputSpan0.setAttribute("class", "required");
-        inputSpan0.innerHTML = " ";
-
-        var generateDescriptionInput = document.createElement("button");
-        inputLI.appendChild(generateDescriptionInput);
-        generateDescriptionInput.setAttribute("id", "generateDescription");
-        generateDescriptionInput.setAttribute("class", "ebBtn ebBtn_large");
-        generateDescriptionInput.setAttribute("type", "submit");
-        generateDescriptionInput.setAttribute("value", "Generate Description");
-        generateDescriptionInput.onclick = editPolicyForm_generateDescriptionPressed;
-        generateDescriptionInput.innerHTML = generateDescriptionInput.getAttribute("value");
-
-        var inputSpan1 = document.createElement("span");
-        inputLI.appendChild(inputSpan1);
-        inputSpan1.setAttribute("class", "required");
-        inputSpan1.innerHTML = " ";
-    }
-
-    var cancelInput = document.createElement("button");
-    inputLI.appendChild(cancelInput);
-    cancelInput.setAttribute("id", "cancel");
-    cancelInput.setAttribute("class", "ebBtn ebBtn_large");
-    cancelInput.setAttribute("type", "submit");
-    cancelInput.setAttribute("value", "Cancel");
-    cancelInput.onclick = editPolicyForm_cancelPressed;
-    cancelInput.innerHTML = cancelInput.getAttribute("value");
-
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var inputSpan2 = document.createElement("span");
-        inputLI.appendChild(inputSpan2);
-        inputSpan2.setAttribute("class", "required");
-        inputSpan2.innerHTML = " ";
-        var submitInput = document.createElement("button");
-        inputLI.appendChild(submitInput);
-        submitInput.setAttribute("id", "submit");
-        submitInput.setAttribute("class", "ebBtn ebBtn_large");
-        submitInput.setAttribute("type", "submit");
-        submitInput.setAttribute("value", "Submit");
-        submitInput.onclick = editPolicyForm_submitPressed;
-        submitInput.innerHTML = submitInput.getAttribute("value");
-    }
-
-    formParent.appendChild(contentelement);
-    scrollToTop();
-}
-
-function editPolicyForm_addNewState(statesUL, createEditOrView, policy, tasks, events, contextAlbums,
-        contextItemSchemas) {
-    var statename = document.getElementById("editEventFormNewStateInput").value;
-    if (statename == null || statename == "") {
-        alert("Please enter a value for the name of the new state\"" + paramname + "\"");
-        document.getElementById("editEventFormNewStateInput").focus();
-        return false;
-    } else if (statename.toUpperCase() == "NULL" || statename.toUpperCase() == "NONE") {
-        alert("Please enter a valid value for the name of the new state\"" + paramname
-                + "\". Values \"NULL\" and \"None\" are not allowed");
-        document.getElementById("editEventFormNewStateInput").focus();
-        return false;
-    } else {
-        document.getElementById("editEventFormNewStateInput").value = "";
-    }
-    if (policy && policy.state) {
-        for (i = 0; i < policy.state.entry.length; i++) {
-            if (statename.toUpperCase() == policy.state.entry[i].key.toUpperCase()) {
-                alert("Policy " + policy.policyKey.name + ":" + policy.policyKey.version
-                        + " already contains a state called \"" + statename + "\".");
-                document.getElementById("editEventFormNewStateInput").focus();
-                return false;
-            }
-        }
-    }
-    var stateLI = editPolicyForm_addState(statename, null, createEditOrView, policy, tasks, events, contextAlbums,
-            contextItemSchemas);
-    statesUL.insertBefore(stateLI, statesUL.lastElementChild);
-    editPolicyForm_updateTriggerEventOptions(events);
-}
-
-function editPolicyForm_getStateOptions() {
-    var stateoptions = new Array();
-    var stateslis = document.getElementById("editEventFormStates").querySelectorAll(
-            "#editEventFormStates > li[stateName]"); // get li direct child
-                                                        // elements with an
-                                                        // attribute "stateName"
-    for (var i = 0; i < stateslis.length; i++) {
-        if (stateslis != null && stateslis[i] != null && stateslis[i].getAttribute("stateName") != null) {
-            stateoptions.push({
-                "name" : stateslis[i].getAttribute("stateName"),
-                "displaytext" : stateslis[i].getAttribute("stateName")
-            });
-        }
-    }
-    return stateoptions;
-}
-
-function editPolicyForm_getNextStateOptions() {
-    var stateoptions = editPolicyForm_getStateOptions();
-    stateoptions.push({
-        "name" : "NULL",
-        "displaytext" : "None"
-    });
-    return stateoptions;
-}
-
-function editPolicyForm_updateTriggerEventOptions(events) {
-    var stateevent = null;
-    var triggerSelectDiv = document.getElementById("editEventFormSelectTrigger_dropdownList");
-    var firstStateSelectDiv = document.getElementById("editEventFormSelectFirstState_dropdownList");
-    var firststate = firstStateSelectDiv.selectedOption;
-    var createEditOrView = document.getElementById("editPolicyForm").getAttribute("createEditOrView");
-    if (firststate != null && firststate.name != null) {
-        var statename = firststate.name;
-        var stateeventselect = document.getElementById("editPolicyFormTrigger_" + statename + "_dropdownList");
-        if (stateeventselect != null && stateeventselect.selectedOption) {
-            stateevent = stateeventselect.selectedOption;
-        }
-        if (createEditOrView == "CREATE") {
-            var periodicCheckbox = document.getElementById("periodicEventsCheckbox");
-            if (periodicCheckbox.hasAttribute("disabled")) {
-                periodicCheckbox.removeAttribute("disabled");
-            }
-        }
-    } else {
-        var triggerSelectDiv = document.getElementById("editEventFormSelectTrigger_dropdownList");
-        triggerSelectDiv.innerHTML = "No Event Selected";
-        var periodicEventsCheckbox = $("#periodicEventsCheckbox");
-        if (periodicEventsCheckbox.is(":checked")) {
-            periodicEventsCheckbox.attr("checked", false);
-        }
-        if (createEditOrView == "CREATE") {
-            var periodicCheckbox = document.getElementById("periodicEventsCheckbox");
-            if (!periodicCheckbox.hasAttribute("disabled")) {
-                periodicCheckbox.disabled = true;
-            }
-        }
-    }
-    if (stateevent) {
-        triggerSelectDiv.innerHTML = stateevent.displaytext;
-        if (stateevent.displaytext.indexOf("PeriodicEvent") == -1) {
-            var periodicEventsCheckbox = $("#periodicEventsCheckbox");
-            if (periodicEventsCheckbox.is(":checked")) {
-                periodicEventsCheckbox.attr("checked", false);
-            }
-        }
-    }
-}
-
-function editPolicyForm_addState(statename, state, createEditOrView, policy, tasks, events, contextAlbums,
-        contextItemSchemas) {
-    var stateLI = document.createElement("li");
-    stateLI.setAttribute("stateName", statename);
-    var deleteDiv = document.createElement("div");
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete");
-        deleteDiv.onclick = function(event) {
-            $(stateLI)
-                    .hide(
-                            "fast",
-                            function() {
-                                stateLI.parentNode.removeChild(stateLI);
-                                var firstState = document
-                                        .getElementById("editEventFormSelectFirstState_dropdownList_display").innerHTML;
-                                var selected = (statename !== firstState) ? {
-                                    name : firstState,
-                                    displaytext : firstState
-                                } : undefined;
-                                dropdownList_ChangeOptions(document
-                                        .getElementById("editEventFormSelectFirstState_dropdownList"),
-                                        editPolicyForm_getStateOptions(), selected, false,
-                                        editPolicyForm_getStateOptions);
-                                editPolicyForm_updateTriggerEventOptions();
-                            });
-        }
-    } else {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete ebIcon_disabled");
-    }
-    deleteDiv.style["vertical-align"] = "baseline";
-    stateLI.appendChild(deleteDiv);
-    var stateLabel = document.createElement("label");
-    stateLabel.style.display = "inline-block";
-    stateLabel.style["min-width"] = "120px";
-    stateLabel.style["padding-left"] = "10px";
-    stateLabel.style["vertical-align"] = "middle";
-    stateLabel.innerHTML = statename;
-    stateLI.appendChild(stateLabel);
-    var stateDiv = editPolicyForm_State_generateStateDiv(createEditOrView, policy, statename, state, tasks, events,
-            contextAlbums, contextItemSchemas);
-    var showhideDIV = showHideElement("editEventFormStates_" + statename, stateDiv, true, "Show " + statename + " ...",
-            "Hide " + statename + " ...", "showhide_div_show", "showhide_div_hide", "showhide_button_show",
-            "showhide_button_hide");
-    showhideDIV.style.display = "inline-block";
-    showhideDIV.style["vertical-align"] = "middle";
-    stateLabel.setAttribute("for", stateDiv.id);
-    stateLI.appendChild(showhideDIV);
-    stateLI.appendChild(stateDiv);
-    return stateLI;
-}
-
-function editPolicyForm_generateUUIDPressed() {
-    document.getElementById("editPolicyFormUuidInput").value = formUtils_generateUUID();
-}
-
-function editPolicyForm_generateDescriptionPressed() {
-    document.getElementById("editPolicyFormDescriptionTextArea").value = formUtils_generateDescription(document
-            .getElementById("editPolicyFormNameInput").value,
-            document.getElementById("editPolicyFormVersionInput").value, document
-                    .getElementById("editPolicyFormUuidInput").value);
-}
-
-function editPolicyForm_cancelPressed() {
-    apexUtils_removeElement("editPolicyFormDiv");
-    policyTab_reset();
-}
-
-function editPolicyForm_submitPressed() {
-    var createEditOrView = document.getElementById("editPolicyForm").getAttribute("createEditOrView");
-    if (!createEditOrView || createEditOrView == "" || (createEditOrView != "CREATE" && createEditOrView != "EDIT")) {
-        console.error("Invalid operation \"" + createEditOrView
-                + "\" passed to editPolicyForm_submitPressed function. Edit failed");
-        apexUtils_removeElement("editPolicyFormDiv");
-        policyTab_reset();
-        return;
-    }
-
-    var policybean = editPolicyForm_getPolicyBean();
-    if (policybean == null) {
-        return false;
-    }
-    var jsonString = JSON.stringify(policybean);
-
-    if (createEditOrView == "CREATE") {
-        var requestURL = restRootURL + "/Policy/Create";
-        ajax_post(requestURL, jsonString, function(resultData) {
-            apexUtils_removeElement("editPolicyFormDiv");
-            policyTab_reset();
-            keyInformationTab_reset();
-        });
-    } else if (createEditOrView == "EDIT") {
-        var firstStatePeriodic = $("#periodicEventsCheckbox").is(":checked")
-        var requestURL = restRootURL + "/Policy/Update?firstStatePeriodic=" + firstStatePeriodic;
-        ajax_put(requestURL, jsonString, function(resultData) {
-            apexUtils_removeElement("editPolicyFormDiv");
-            policyTab_reset();
-            keyInformationTab_reset();
-        });
-    }
-
-}
-
-function editPolicyForm_getPolicyBean() {
-
-    var name = document.getElementById('editPolicyFormNameInput').value;
-    if (name == null || name == "") {
-        console.error("No Name is specified for the policy");
-        alert("No Name is specified for the policy");
-        return null;
-    }
-    var version = document.getElementById('editPolicyFormVersionInput').value;
-    if (version == null || version == "") {
-        console.error("No Version is specified for the policy");
-        alert("No Version is specified for the policy");
-        return null;
-    }
-    var uuid = document.getElementById('editPolicyFormUuidInput').value;
-    if (uuid == null || uuid == "") {
-        console.error("No UUID is specified for the policy");
-        alert("No UUID is specified for the policy");
-        return null;
-    }
-    var desc = document.getElementById('editPolicyFormDescriptionTextArea').value;
-    if (desc == null) {
-        desc = "";
-    }
-    var template = document.getElementById('editEventFormTemplateTypeInput').value;
-    if (template == null) {
-        template = "";
-    }
-    var firststateselectedoption = document.getElementById("editEventFormSelectFirstState" + "_dropdownList").selectedOption;
-    if (firststateselectedoption == null) {
-        console.error("Please select an option for First State");
-        alert("Please select an option for First State");
-        return null;
-    }
-    var states = new Object();
-    var stateslis = document.getElementById("editEventFormStates").querySelectorAll(
-            "#editEventFormStates > li[stateName]"); // get li direct child
-                                                        // elements with an
-                                                        // attribute "stateName"
-    for (var i = 0; i < stateslis.length; i++) { // ignore last li ... it has
-                                                    // the new state button etc.
-        if (stateslis != null && stateslis[i] != null && stateslis[i].getAttribute("stateName") != null) {
-            var statename = stateslis[i].getAttribute("stateName");
-            var state = editPolicyForm_State_getStateBean(statename);
-            if (state == null) {
-                return null;
-            }
-            states[statename] = state;
-        }
-    }
-
-    var policybean = {
-        "name" : name,
-        "version" : version,
-        "uuid" : uuid,
-        "description" : desc,
-        "template" : template,
-        "firstState" : firststateselectedoption.name,
-        "states" : states
-    };
-    return policybean;
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm_State.js b/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm_State.js
deleted file mode 100644
index 968d2da9a..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexPolicyEditForm_State.js
+++ /dev/null
@@ -1,1128 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function editPolicyForm_State_generateStateDiv(createEditOrView, policy, statename, state, tasks, events,
-        contextAlbums, contextItemSchemas) {
-    var retDiv = document.createElement("div");
-    retDiv.setAttribute("id", "editPolicyFormStateDiv_" + statename);
-    retDiv.setAttribute("class", "editPolicyFormStateDiv");
-    var divUL = document.createElement("ul");
-    retDiv.appendChild(divUL);
-
-    // input event
-    var triggerLI = document.createElement("li");
-    divUL.appendChild(triggerLI);
-    var triggerLabel = document.createElement("label");
-    triggerLI.appendChild(triggerLabel);
-    triggerLabel.setAttribute("for", "editPolicyFormTrigger" + "_" + statename);
-    triggerLabel.innerHTML = "Input Event for State: ";
-    var eventselected = null;
-    if (state != null && state.trigger != null) {
-        eventselected = {
-            "name" : state.trigger.name,
-            "version" : state.trigger.version,
-            "displaytext" : state.trigger.name + ":" + state.trigger.version
-        };
-    }
-    var ineventSelectDiv = dropdownList("editPolicyFormTrigger" + "_" + statename, events, eventselected,
-            (createEditOrView == "VIEW"), function() {
-                return editPolicyForm_updateTriggerEventOptions(events)
-            });
-    triggerLI.appendChild(ineventSelectDiv);
-
-    // Context Albums references
-    var contextsLI = document.createElement("li");
-    divUL.appendChild(contextsLI);
-    var contextsLabel = document.createElement("label");
-    contextsLI.appendChild(contextsLabel);
-    contextsLabel.setAttribute("for", "editPolicyFormContextsTable" + "_" + statename);
-    contextsLabel.innerHTML = "Context Albums used in Task Selection Logic / State Output Logic: ";
-    var contextstable = document.createElement("table");
-    contextstable.setAttribute("id", "editPolicyFormContextsTable" + "_" + statename);
-    contextstable.setAttribute("name", "editPolicyFormContextsTable" + "_" + statename);
-    contextstable.setAttribute("class", "table-policycontext");
-    contextsLI.appendChild(contextstable);
-    // var contextstable_head = document.createElement("thead");
-    // contextstable.appendChild(contextstable_head);
-    // var contextstable_head_tr = document.createElement("tr");
-    // contextstable_head.appendChild(contextstable_head_tr);
-    // contextstable_head_tr.appendChild(document.createElement("th")); //empty,
-    // for delete button
-    // var contextstable_head_th = document.createElement("th");
-    // contextstable_head_tr.appendChild(contextstable_head_th);
-    // contextstable_head_th.innerHTML = "Context Album: ";
-    // contextstable_head_th.setAttribute("class",
-    // "table-policycontext-heading");
-    var contextstable_body = document.createElement("tbody");
-    contextstable.appendChild(contextstable_body);
-    // Add the contexts
-    if (state && state.contextAlbumReference && $.isArray(state.contextAlbumReference)) {
-        for (var p = 0; p < state.contextAlbumReference.length; p++) {
-            var contextEntry = state.contextAlbumReference[p];
-            var contextName = contextEntry.name + ":" + contextEntry.version;
-            var ce = {
-                "name" : contextEntry.name,
-                "version" : contextEntry.version,
-                "displaytext" : contextName
-            };
-            editPolicyForm_State_addPolicyContext(contextstable_body, (createEditOrView == "VIEW"), statename,
-                    contextName, ce, contextAlbums);
-        }
-    }
-    // add the Policy Context button
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var contextTR = document.createElement("tr");
-        contextTR.setAttribute("class", "field-policycontext-tr.new");
-        contextstable_body.appendChild(contextTR);
-
-        var contextTD = document.createElement("td");
-        contextTD.setAttribute("colspan", "2");
-        contextTR.appendChild(contextTD);
-        var addContextInput = createAddFormButton("Add New Policy Logic Context");
-        contextTD.appendChild(addContextInput);
-        // addContextInput.setAttribute("id", "addContextButton");
-        // addContextInput.setAttribute("class", "ebBtn ebBtn_large");
-        // addContextInput.setAttribute("type", "submit");
-        // addContextInput.setAttribute("value", "Add New Policy Logic
-        // Context");
-        // addContextInput.innerHTML = addContextInput.getAttribute("value");
-        addContextInput.onclick = function() {
-            return editPolicyForm_State_addPolicyContext(contextstable_body, false, statename, null, null,
-                    contextAlbums);
-        };
-    }
-
-    // Task references
-    var tasksLI = document.createElement("li");
-    divUL.appendChild(tasksLI);
-    var tasksLabel = document.createElement("label");
-    tasksLI.appendChild(tasksLabel);
-    tasksLabel.setAttribute("for", "editPolicyFormTasksTable" + "_" + statename);
-    tasksLabel.innerHTML = "State Tasks:";
-    var taskstable = document.createElement("table");
-    taskstable.setAttribute("id", "editPolicyFormTasksTable" + "_" + statename);
-    taskstable.setAttribute("name", "editPolicyFormTasksTable" + "_" + statename);
-    taskstable.setAttribute("class", "table-policytask");
-    tasksLI.appendChild(taskstable);
-    var taskstable_head = document.createElement("thead");
-    taskstable.appendChild(taskstable_head);
-    var taskstable_head_tr = document.createElement("tr");
-    taskstable_head.appendChild(taskstable_head_tr);
-    taskstable_head_tr.appendChild(document.createElement("th")); // empty,
-                                                                    // for
-                                                                    // delete
-                                                                    // button
-    var taskstable_isdefault_head_th = document.createElement("th");
-    taskstable_head_tr.appendChild(taskstable_isdefault_head_th);
-    taskstable_isdefault_head_th.innerHTML = "Default Task? ";
-    taskstable_isdefault_head_th.setAttribute("class", "table-policytask-heading form-heading");
-    var taskstable_localname_head_th = document.createElement("th");
-    taskstable_head_tr.appendChild(taskstable_localname_head_th);
-    taskstable_localname_head_th.innerHTML = "Local Name for Task: ";
-    taskstable_localname_head_th.setAttribute("class", "table-policytask-heading form-heading");
-    var taskstable_head_th = document.createElement("th");
-    taskstable_head_tr.appendChild(taskstable_head_th);
-    taskstable_head_th.innerHTML = "Task: ";
-    taskstable_head_th.setAttribute("class", "table-policytask-heading form-heading");
-    var taskstable_outputtype_head_th = document.createElement("th");
-    taskstable_head_tr.appendChild(taskstable_outputtype_head_th);
-    taskstable_outputtype_head_th.innerHTML = "Output Mapping type: ";
-    taskstable_outputtype_head_th.setAttribute("class", "table-policytask-heading form-heading");
-    taskstable_outputtype_head_th.setAttribute("colspan", "2");
-    var taskstable_outputsel_head_th = document.createElement("th");
-    taskstable_head_tr.appendChild(taskstable_outputsel_head_th);
-    taskstable_outputsel_head_th.innerHTML = "Output Mapping: ";
-    taskstable_outputsel_head_th.setAttribute("class", "table-policytask-heading form-heading");
-    var taskstable_body = document.createElement("tbody");
-    taskstable.appendChild(taskstable_body);
-    var defaulttask = null;
-    if (state && state.defaultTask && state.defaultTask.name && state.defaultTask.version) {
-        defaulttask = state.defaultTask.name + ":" + state.defaultTask.version;
-    }
-    // Add the tasks
-    if (state && state.taskReferences && $.isArray(state.taskReferences.entry)) {
-        for (var p = 0; p < state.taskReferences.entry.length; p++) {
-            var taskEntry = state.taskReferences.entry[p];
-            var taskName = taskEntry.key.name + ":" + taskEntry.key.version;
-            var taskselected = {
-                "name" : taskEntry.key.name,
-                "version" : taskEntry.key.version,
-                "displaytext" : taskName
-            };
-            var taskreference = taskEntry.value;
-            editPolicyForm_State_addPolicyTask(taskstable_body, (createEditOrView == "VIEW"),
-                    (defaulttask == taskName), state, statename, taskreference, taskselected, tasks);
-        }
-    }
-    // add the Policy Task button
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var taskTR = document.createElement("tr");
-        taskTR.setAttribute("class", "field-policytask-tr.new");
-        taskstable_body.appendChild(taskTR);
-        var taskTD = document.createElement("td");
-        taskTD.setAttribute("colspan", "4");
-        taskTR.appendChild(taskTD);
-        var addTaskInput = createAddFormButton("Add New Task");
-        taskTD.appendChild(addTaskInput);
-        // addTaskInput.setAttribute("id", "addTaskButton");
-        // addTaskInput.setAttribute("class", "ebBtn ebBtn_large");
-        // addTaskInput.setAttribute("type", "submit");
-        // addTaskInput.setAttribute("value", "Add New Task");
-        // addTaskInput.innerHTML = addTaskInput.getAttribute("value");
-        addTaskInput.onclick = function() {
-            return editPolicyForm_State_addPolicyTask(taskstable_body, false, false, state, statename, null, null,
-                    tasks);
-        };
-    }
-
-    // tasksellogic
-    var tasksellogicLI = document.createElement("li");
-    divUL.appendChild(tasksellogicLI);
-    var tasksellogicLabel = document.createElement("label");
-    tasksellogicLI.appendChild(tasksellogicLabel);
-    tasksellogicLabel.setAttribute("for", "editEventFormTaskSelLogicDiv" + "_" + statename);
-    tasksellogicLabel.innerHTML = "Task Selection Logic: ";
-    var tasksellogicdiv = document.createElement("div");
-    tasksellogicdiv.setAttribute("id", "editEventFormTaskSelLogicDiv" + "_" + statename);
-
-    var logic = "";
-    if (state && state.taskSelectionLogic && state.taskSelectionLogic.logic && state.taskSelectionLogic.logic != "") {
-        logic = state.taskSelectionLogic.logic;
-    }
-    var edit_disabled = false;
-    if (createEditOrView != "CREATE" && createEditOrView != "EDIT") {
-        edit_disabled = true;
-    }
-    var textarea = showHideTextarea("editEventFormTaskSelLogicInput" + "_" + statename, logic, false, !edit_disabled,
-            false);
-
-    tasksellogicLI.appendChild(textarea);
-
-    // tasksellogic type
-    var tasksellogicTypeLabel = document.createElement("label");
-    tasksellogicdiv.appendChild(tasksellogicTypeLabel);
-    tasksellogicTypeLabel.setAttribute("for", "editPolicyFormTaskSelLogicTypeInput" + "_" + statename);
-    tasksellogicTypeLabel.innerHTML = "Task Selection Logic Type / Flavour: ";
-    var tasksellogicTypeInput = document.createElement("input");
-    tasksellogicdiv.appendChild(tasksellogicTypeInput);
-    tasksellogicTypeInput.setAttribute("id", "editPolicyFormTaskSelLogicTypeInput" + "_" + statename);
-    tasksellogicTypeInput.setAttribute("type", "text");
-    tasksellogicTypeInput.setAttribute("name", "editPolicyFormTaskSelLogicTypeInput" + "_" + statename);
-    tasksellogicTypeInput.setAttribute("class", "field-taskSelLogicType ebInput ebInput_width_xLong");
-    tasksellogicTypeInput.setAttribute("placeholder", "MVEL");
-    if (state && state.taskSelectionLogic && state.taskSelectionLogic.logicFlavour != null
-            && state.taskSelectionLogic.logicFlavour != ""
-            && state.taskSelectionLogic.logicFlavour.toUpperCase() != "UNDEFINED") {
-        tasksellogicTypeInput.value = state.taskSelectionLogic.logicFlavour;
-    }
-    tasksellogicTypeInput.readOnly = (createEditOrView != "CREATE" && createEditOrView != "EDIT");
-
-    divUL.appendChild(tasksellogicdiv);
-
-    // Output mappings
-    var outputsLI = document.createElement("li");
-    divUL.appendChild(outputsLI);
-    var outputsLabel = document.createElement("label");
-    outputsLI.appendChild(outputsLabel);
-    outputsLabel.innerHTML = "State Output Mappings: ";
-    outputsLabel.setAttribute("for", "editPolicyFormOutputsUL" + "_" + statename);
-    var outsUL = document.createElement("ul");
-    outsUL.setAttribute("id", "editPolicyFormOutputsUL" + "_" + statename);
-    outputsLI.appendChild(outsUL);
-    // Direct Output Mappings
-    var dir_outputsLI = document.createElement("li");
-    outsUL.appendChild(dir_outputsLI);
-    var dir_outputsLabel = document.createElement("label");
-    dir_outputsLI.appendChild(dir_outputsLabel);
-    dir_outputsLI.innerHTML = "Direct State Output Mappings: ";
-    dir_outputsLabel.setAttribute("for", "editPolicyFormDirOutputsTable" + "_" + statename);
-    var dir_outputstable = document.createElement("table");
-    dir_outputstable.setAttribute("id", "editPolicyFormDirOutputsTable" + "_" + statename);
-    dir_outputstable.setAttribute("name", "editPolicyFormDirOutputsTable" + "_" + statename);
-    dir_outputstable.setAttribute("class", "table-policyoutput");
-    dir_outputsLI.appendChild(dir_outputstable);
-    var dir_outputstable_head = document.createElement("thead");
-    dir_outputstable.appendChild(dir_outputstable_head);
-    var dir_outputstable_head_tr = document.createElement("tr");
-    dir_outputstable_head.appendChild(dir_outputstable_head_tr);
-    dir_outputstable_head_tr.appendChild(document.createElement("th")); // empty,
-                                                                        // for
-                                                                        // delete
-                                                                        // button
-    var dir_outputstable_name_head_th = document.createElement("th");
-    dir_outputstable_head_tr.appendChild(dir_outputstable_name_head_th);
-    dir_outputstable_name_head_th.innerHTML = "Local Name for Output Mapping: ";
-    dir_outputstable_name_head_th.setAttribute("class", "table-policyoutput-heading form-heading");
-    var dir_outputstable_nextstate_head_th = document.createElement("th");
-    dir_outputstable_head_tr.appendChild(dir_outputstable_nextstate_head_th);
-    dir_outputstable_nextstate_head_th.innerHTML = "Next State: ";
-    dir_outputstable_nextstate_head_th.setAttribute("class", "table-policyoutput-heading form-heading");
-    var dir_outputstable_event_head_th = document.createElement("th");
-    dir_outputstable_head_tr.appendChild(dir_outputstable_event_head_th);
-    dir_outputstable_event_head_th.innerHTML = "State Output Event: ";
-    dir_outputstable_event_head_th.setAttribute("class", "table-policyoutput-heading form-heading");
-    var dir_outputstable_body = document.createElement("tbody");
-    dir_outputstable.appendChild(dir_outputstable_body);
-    var stateNextStateOptions = new Array();
-    stateNextStateOptions.push({
-        "name" : "NULL",
-        "displaytext" : "None",
-        "state" : null
-    });
-    if (policy && policy.state && policy.state.entry && $.isArray(policy.state.entry)) {
-        for (var s = 0; s < policy.state.entry.length; s++) {
-            var st = policy.state.entry[s];
-            if (statename != st.key) { // state cannot have itself as nextstate
-                stateNextStateOptions.push({
-                    "name" : st.key,
-                    "displaytext" : st.key,
-                    "state" : st.value
-                });
-            }
-        }
-    }
-    if (state && state.stateOutputs && $.isArray(state.stateOutputs.entry)) {
-        for (var p = 0; p < state.stateOutputs.entry.length; p++) {
-            var outputEntry = state.stateOutputs.entry[p];
-            var outputName = outputEntry.key;
-            var nextState = null;
-            var nxtst = outputEntry.value.nextState.localName;
-            if (nxtst != null && nxtst.toUpperCase() != "NULL") {
-                nextState = {
-                    "name" : nxtst,
-                    "displaytext" : nxtst
-                };
-            }
-            if (nxtst != null && nxtst.toUpperCase() == "NULL") {
-                nextState = {
-                    "name" : "NULL",
-                    "displaytext" : "None"
-                };
-            }
-            var outEvent = null;
-            var oute = outputEntry.value.outgoingEvent;
-            if (oute != null && oute.name != null && oute.version != null) {
-                outEvent = {
-                    "name" : oute.name,
-                    "version" : oute.version,
-                    "displaytext" : oute.name + ":" + oute.version
-                };
-            }
-            editPolicyForm_State_addStateDirectOutput(dir_outputstable_body, (createEditOrView == "VIEW"), statename,
-                    state, outputName, nextState, outEvent, stateNextStateOptions, events);
-        }
-    }
-    // add the new Direct output button
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var dir_outputTR = document.createElement("tr");
-        dir_outputTR.setAttribute("class", "field-policyoutput-tr.new");
-        dir_outputstable_body.appendChild(dir_outputTR);
-        var dir_outputTD = document.createElement("td");
-        dir_outputTD.setAttribute("colspan", "4");
-        dir_outputTR.appendChild(dir_outputTD);
-        var addStateDirOutput = createAddFormButton("Add New Direct State Output Mapping")
-        dir_outputTD.appendChild(addStateDirOutput);
-        // addStateDirOutput.setAttribute("id",
-        // "editPolicyFormDirOutputsAddOutput"+"_"+statename);
-        // addStateDirOutput.setAttribute("class", "ebBtn ebBtn_large");
-        // addStateDirOutput.setAttribute("type", "submit");
-        // addStateDirOutput.setAttribute("value", Add New Direct State Output
-        // Mapping);
-        // addStateDirOutput.innerHTML =
-        // addStateDirOutput.getAttribute("value");
-        addStateDirOutput.onclick = function() {
-            return editPolicyForm_State_addStateDirectOutput(dir_outputstable_body, false, statename, state, null,
-                    null, null, stateNextStateOptions, events);
-        };
-    }
-    // Logic-based Output Mappings
-    var logic_outputsLI = document.createElement("li");
-    outsUL.appendChild(logic_outputsLI);
-    var logic_outputsLabel = document.createElement("label");
-    logic_outputsLI.appendChild(dir_outputsLabel);
-    logic_outputsLI.innerHTML = "Logic-based State Output Mappings / Finalizers: ";
-    logic_outputsLabel.setAttribute("for", "editPolicyFormLogicOutputsTable" + "_" + statename);
-    var logic_outputstable = document.createElement("table");
-    logic_outputstable.setAttribute("id", "editPolicyFormLogicOutputsTable" + "_" + statename);
-    logic_outputstable.setAttribute("name", "editPolicyFormLogicOutputsTable" + "_" + statename);
-    logic_outputstable.setAttribute("class", "table-policyoutput");
-    logic_outputsLI.appendChild(logic_outputstable);
-    var logic_outputstable_head = document.createElement("thead");
-    logic_outputstable.appendChild(logic_outputstable_head);
-    var logic_outputstable_head_tr = document.createElement("tr");
-    logic_outputstable_head.appendChild(logic_outputstable_head_tr);
-    logic_outputstable_head_tr.appendChild(document.createElement("th")); // empty,
-                                                                            // for
-                                                                            // delete
-                                                                            // button
-    var logic_outputstable_name_head_th = document.createElement("th");
-    logic_outputstable_head_tr.appendChild(logic_outputstable_name_head_th);
-    logic_outputstable_name_head_th.innerHTML = "Local Name for Output Mapping: ";
-    logic_outputstable_name_head_th.setAttribute("class", "table-policyoutput-heading form-heading");
-    var logic_outputstablelogic_head_th = document.createElement("th");
-    logic_outputstable_head_tr.appendChild(logic_outputstablelogic_head_th);
-    logic_outputstablelogic_head_th.style.textAlign = "left";
-    logic_outputstablelogic_head_th.innerHTML = "Output Mapping / Finalizer Logic: ";
-    logic_outputstablelogic_head_th.setAttribute("class", "table-policyoutput-heading form-heading");
-    var logic_outputstable_body = document.createElement("tbody");
-    logic_outputstable.appendChild(logic_outputstable_body);
-    if (state && state.stateFinalizerLogicMap && $.isArray(state.stateFinalizerLogicMap.entry)) {
-        for (var p = 0; p < state.stateFinalizerLogicMap.entry.length; p++) {
-            var outputEntry = state.stateFinalizerLogicMap.entry[p];
-            var outputName = outputEntry.key;
-            var logic = null;
-            if (outputEntry.value != null && outputEntry.value.logic != null) {
-                logic = outputEntry.value.logic;
-            }
-            var flavour = null;
-            if (outputEntry.value != null && outputEntry.value.logicFlavour != null) {
-                flavour = outputEntry.value.logicFlavour;
-            }
-            editPolicyForm_State_addStateLogicOutput(logic_outputstable_body, (createEditOrView == "VIEW"), statename,
-                    state, outputName, logic, flavour);
-        }
-    }
-    // add the new Logic output button
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var logic_outputTR = document.createElement("tr");
-        logic_outputTR.setAttribute("class", "field-policyoutput-tr.new");
-        logic_outputstable_body.appendChild(logic_outputTR);
-        var logic_outputTD = document.createElement("td");
-        logic_outputTD.setAttribute("colspan", "3");
-        logic_outputTR.appendChild(logic_outputTD);
-        var addStateLogicOutput = createAddFormButton("Add New Logic-based State Output Mapping / Finalizer");
-        logic_outputTD.appendChild(addStateLogicOutput);
-        // addStateLogicOutput.setAttribute("id",
-        // "editPolicyFormLogicOutputsAddOutput"+"_"+statename);
-        // addStateLogicOutput.setAttribute("class", "ebBtn ebBtn_large");
-        // addStateLogicOutput.setAttribute("type", "submit");
-        // addStateLogicOutput.setAttribute("value", "Add New Logic-based State
-        // Output Mapping / Finalizer");
-        // addStateLogicOutput.innerHTML =
-        // addStateLogicOutput.getAttribute("value");
-        addStateLogicOutput.onclick = function() {
-            return editPolicyForm_State_addStateLogicOutput(logic_outputstable_body, false, statename, state, null,
-                    null, null);
-        };
-    }
-    return retDiv;
-}
-function editPolicyForm_State_addStateLogicOutput(parentTBody, disabled, statename, state, outputName, logic, flavour) {
-    var random_suffix = formUtils_generateUUID();
-    var outputTR = parentTBody.insertRow(parentTBody.rows.length - 1);
-    outputTR.style.verticalAlign = "top";
-    outputTR.style.textAlign = "left";
-    outputTR.setAttribute("finalizer_id", random_suffix);
-    outputTR.setAttribute("class", "field-policyoutput-tr");
-    if (outputName == null && !disabled) {
-        outputTR.setAttribute("class", "field-policyoutput-tr.new");
-    }
-    // delete
-    var deleteTD = document.createElement("td");
-    outputTR.appendChild(deleteTD);
-    var deleteDiv = document.createElement("div");
-    deleteTD.appendChild(deleteDiv);
-    if (!disabled) {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete");
-        deleteDiv.onclick = function(event) {
-            $(outputTR).hide("fast", function() {
-                outputTR.parentNode.removeChild(outputTR);
-            });
-        };
-    } else {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete ebIcon_disabled");
-    }
-    // name
-    var nameTD = document.createElement("td");
-    nameTD.style.whiteSpace = "nowrap";
-    outputTR.appendChild(nameTD);
-    var nameInput = document.createElement("input");
-    nameTD.appendChild(nameInput);
-    nameInput.setAttribute("id", "editPolicyFormLogicOutputNameValue" + "_" + statename + "_" + random_suffix);
-    nameInput.setAttribute("type", "text");
-    nameInput.setAttribute("name", "editPolicyFormLogicOutputNameValue" + "_" + statename + "_" + random_suffix);
-    nameInput.setAttribute("class", "field-policy-outputname");
-    if (outputName == null && logic == null && flavour == null && !disabled) {
-        nameInput.setAttribute("class", "field-policy-outputname.new ebInput ebInput_width_xLong");
-    }
-    nameInput.setAttribute("placeholder", "A name for this Output mapper");
-    if (outputName) {
-        nameInput.value = outputName;
-    }
-    nameInput.readOnly = disabled;
-    // logic
-    var logicTD = document.createElement("td");
-    logicTD.style.width = "99%";
-    logicTD.style.whiteSpace = "nowrap";
-    outputTR.appendChild(logicTD);
-    var finalizerlogicdiv = document.createElement("div");
-    logicTD.appendChild(finalizerlogicdiv);
-    finalizerlogicdiv.setAttribute("id", "editEventFormFinalizerLogicDiv" + "_" + statename + "_" + random_suffix);
-    var finalizerlogicLabel = document.createElement("label");
-    finalizerlogicdiv.appendChild(finalizerlogicLabel);
-    finalizerlogicLabel.setAttribute("for", "editEventFormfinalizerLogicInput" + "_" + statename + "_" + random_suffix);
-    finalizerlogicLabel.innerHTML = "Logic: ";
-
-    var logicString = "";
-    if (logic != null) {
-        logicString = logic;
-    }
-    var edit_readOnly = disabled;
-    var textarea = showHideTextarea("editEventFormfinalizerLogicInput" + "_" + statename + "_" + random_suffix, logic,
-            false, !edit_readOnly, false);
-    finalizerlogicdiv.appendChild(textarea);
-
-    // finalizerlogic type
-    var finalizerlogicTypeLabel = document.createElement("label");
-    finalizerlogicdiv.appendChild(finalizerlogicTypeLabel);
-    finalizerlogicTypeLabel.setAttribute("for", "editPolicyFormFinalizerLogicTypeInput" + "_" + statename + "_"
-            + random_suffix);
-    finalizerlogicTypeLabel.innerHTML = "Type / Flavour: ";
-    var finalizerlogicTypeInput = document.createElement("input");
-    finalizerlogicdiv.appendChild(finalizerlogicTypeInput);
-    finalizerlogicTypeInput.setAttribute("id", "editPolicyFormFinalizerLogicTypeInput" + "_" + statename + "_"
-            + random_suffix);
-    finalizerlogicTypeInput.setAttribute("type", "text");
-    finalizerlogicTypeInput.setAttribute("name", "editPolicyFormFinalizerLogicTypeInput" + "_" + statename + "_"
-            + random_suffix);
-    finalizerlogicTypeInput.setAttribute("class", "field-finalizerLogicType ebInput ebInput_width_xLong");
-    finalizerlogicTypeInput.setAttribute("placeholder", "MVEL");
-    if (flavour != null) {
-        finalizerlogicTypeInput.value = flavour;
-    }
-    finalizerlogicTypeInput.readOnly = disabled;
-
-    logicTD.appendChild(finalizerlogicdiv);
-}
-
-function editPolicyForm_State_addStateDirectOutput(parentTBody, disabled, stateName, state, outputName, nextState,
-        outEvent, stateNextStateOptions, events) {
-    var random_suffix = formUtils_generateUUID();
-    var outputTR = parentTBody.insertRow(parentTBody.rows.length - 1);
-    outputTR.setAttribute("output_id", random_suffix);
-    outputTR.setAttribute("class", "field-policyoutput-tr");
-    if (outputName == null && nextState == null && nextState == null && !disabled) {
-        outputTR.setAttribute("class", "field-policyoutput-tr.new");
-    }
-    // delete
-    var deleteTD = document.createElement("td");
-    outputTR.appendChild(deleteTD);
-    var deleteDiv = document.createElement("div");
-    deleteTD.appendChild(deleteDiv);
-    if (!disabled) {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete");
-        deleteDiv.onclick = function(event) {
-            $(outputTR).hide("fast", function() {
-                outputTR.parentNode.removeChild(outputTR);
-            });
-        }
-    } else {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete ebIcon_disabled");
-    }
-    // name
-    var nameTD = document.createElement("td");
-    outputTR.appendChild(nameTD);
-    var nameInput = document.createElement("input");
-    nameTD.appendChild(nameInput);
-    nameInput.setAttribute("id", "editPolicyFormDirectOutputNameValue" + "_" + stateName + "_" + random_suffix);
-    nameInput.setAttribute("type", "text");
-    nameInput.setAttribute("name", "editPolicyFormDirectOutputNameValue" + "_" + stateName + "_" + random_suffix);
-    nameInput.setAttribute("class", "field-policy-outputname ebInput ebInput_width_xLong");
-    if (outputName == null && nextState == null && nextState == null && !disabled) {
-        nameInput.setAttribute("class", "field-policy-outputname.new ebInput ebInput_width_xLong");
-    }
-    nameInput.setAttribute("placeholder", "A name for this Output mapper");
-    if (outputName) {
-        nameInput.value = outputName;
-    }
-    nameInput.readOnly = disabled;
-    // outputEvent
-    var outeventTD = document.createElement("td");
-    var outeventSelectDiv = dropdownList("editPolicyFormOutputEventValue" + "_" + stateName + "_" + random_suffix,
-            events, outEvent, disabled, null);
-    outeventTD.appendChild(outeventSelectDiv);
-    // nextstate
-    var nextstateTD = document.createElement("td");
-    var nextstateSelectDiv = dropdownList("editPolicyFormOutputNextStateValue" + "_" + stateName + "_" + random_suffix,
-            stateNextStateOptions, nextState, disabled, null, function() {
-                return editPolicyForm_getNextStateOptions();
-            });
-    nextstateTD.appendChild(nextstateSelectDiv);
-
-    outputTR.appendChild(nextstateTD);
-    outputTR.appendChild(outeventTD);
-
-}
-
-function editPolicyForm_State_addPolicyContext(parentTBody, disabled, stateName, contextName, contextreference,
-        contextAlbums) {
-    var random_suffix = formUtils_generateUUID();
-    var contextTR = parentTBody.insertRow(parentTBody.rows.length - 1);
-    contextTR.setAttribute("context_id", random_suffix);
-    contextTR.setAttribute("class", "field-policycontext-tr");
-    if (contextName == null && contextreference == null && !disabled) {
-        contextTR.setAttribute("class", "field-policycontext-tr.new");
-    }
-    // delete
-    var deleteTD = document.createElement("td");
-    contextTR.appendChild(deleteTD);
-    var deleteDiv = document.createElement("div");
-    deleteTD.appendChild(deleteDiv);
-    if (!disabled) {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete");
-        deleteDiv.onclick = function(event) {
-            $(contextTR).hide("fast", function() {
-                contextTR.parentNode.removeChild(contextTR);
-            });
-        }
-    } else {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete ebIcon_disabled");
-    }
-    // context
-    var valueTD = document.createElement("td");
-    contextTR.appendChild(valueTD);
-    var selectDiv = dropdownList("editPolicyFormContextValue" + "_" + stateName + "_" + random_suffix, contextAlbums,
-            contextreference, disabled, null);
-    valueTD.appendChild(selectDiv);
-}
-
-function editPolicyForm_State_addPolicyTask(parentTBody, disabled, isdefault, state, stateName, taskreference,
-        taskSelected, taskOptions) {
-    var random_suffix = formUtils_generateUUID();
-    var taskTR = parentTBody.insertRow(parentTBody.rows.length - 1);
-    taskTR.setAttribute("task_id", random_suffix);
-    taskTR.setAttribute("class", "field-policytask-tr");
-    if (taskreference && taskSelected == null && !disabled) {
-        taskTR.setAttribute("class", "field-policytask-tr.new");
-    }
-    // delete
-    var deleteTD = document.createElement("td");
-    taskTR.appendChild(deleteTD);
-    var deleteDiv = document.createElement("div");
-    deleteTD.appendChild(deleteDiv);
-    if (!disabled) {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete");
-        deleteDiv.onclick = function(event) {
-            $(taskTR).hide("fast", function() {
-                taskTR.parentNode.removeChild(taskTR);
-            });
-        }
-    } else {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete ebIcon_disabled");
-    }
-    // default
-    var defaulttaskTD = document.createElement("td");
-    taskTR.appendChild(defaulttaskTD);
-    var defaulttaskInput = document.createElement("input");
-    defaulttaskTD.appendChild(defaulttaskInput);
-    defaulttaskInput.setAttribute("id", "editPolicyFormTaskIsDefault" + "_" + stateName + "_" + random_suffix);
-    defaulttaskInput.setAttribute("value", "editPolicyFormTaskIsDefault" + "_" + stateName + "_" + random_suffix);
-    defaulttaskInput.setAttribute("type", "radio");
-    defaulttaskInput.setAttribute("name", "editPolicyFormTaskIsDefault" + "_" + stateName); // group
-                                                                                            // name
-    defaulttaskInput.setAttribute("class", "field-policy-taskisdefault");
-    if (taskreference == null && taskSelected == null && !disabled) {
-        defaulttaskInput.setAttribute("class", "field-policy-taskisdefault.new");
-    }
-    defaulttaskInput.checked = isdefault;
-    defaulttaskInput.readOnly = disabled;
-    // localname
-    var localnameTD = document.createElement("td");
-    taskTR.appendChild(localnameTD);
-    var localnameInput = document.createElement("input");
-    localnameTD.appendChild(localnameInput);
-    localnameInput.setAttribute("id", "editPolicyFormTaskLocalNameValue" + "_" + stateName + "_" + random_suffix);
-    localnameInput.setAttribute("type", "text");
-    localnameInput.setAttribute("name", "editPolicyFormTaskLocalNameValue" + "_" + stateName + "_" + random_suffix);
-    localnameInput.setAttribute("class", "field-policy-tasklocalname ebInput ebInput_width_xLong");
-    if (taskreference == null && taskSelected == null && !disabled) {
-        localnameInput.setAttribute("class", "field-policy-tasklocalname.new ebInput ebInput_width_xLong");
-    }
-    localnameInput.setAttribute("placeholder", "Task's Local Name");
-    if (taskreference != null && taskreference.key != null && taskreference.key.localName != null) {
-        localnameInput.value = taskreference.key.localName;
-    }
-    localnameInput.readOnly = disabled;
-    // task
-    var valueTD = document.createElement("td");
-    taskTR.appendChild(valueTD);
-    var selectDiv = dropdownList("editPolicyFormTaskValue" + "_" + stateName + "_" + random_suffix, taskOptions,
-            taskSelected, disabled, null);
-    valueTD.appendChild(selectDiv);
-    // output type
-    var outputTypeDirectTD = document.createElement("td");
-    taskTR.appendChild(outputTypeDirectTD);
-    var outputTypeDirectLabel = document.createElement("label");
-    outputTypeDirectTD.appendChild(outputTypeDirectLabel);
-    outputTypeDirectLabel.setAttribute("for", "editPolicyFormTaskOutputType" + "_" + stateName + "_" + random_suffix
-            + "_DIRECT");
-    outputTypeDirectLabel.setAttribute("class", "label-policy-taskoutputtype");
-    outputTypeDirectLabel.innerHTML = " DIRECT";
-    var outputTypeDirectInput = document.createElement("input");
-    outputTypeDirectLabel.appendChild(outputTypeDirectInput);
-    outputTypeDirectInput.setAttribute("id", "editPolicyFormTaskOutputType" + "_" + stateName + "_" + random_suffix
-            + "_DIRECT");
-    outputTypeDirectInput.setAttribute("value", "DIRECT");
-    outputTypeDirectInput.setAttribute("type", "radio");
-    outputTypeDirectInput.setAttribute("name", "editPolicyFormTaskOutputType" + "_" + stateName + "_" + random_suffix); // group
-                                                                                                                        // name
-    outputTypeDirectInput.setAttribute("class", "field-policy-taskoutputtype");
-    if (taskreference == null && taskSelected == null && !disabled) {
-        outputTypeDirectInput.setAttribute("class", "field-policy-taskoutputtype.new");
-    }
-    if (taskreference != null && taskreference.outputType != null && taskreference.outputType.toUpperCase() == "DIRECT") {
-        outputTypeDirectInput.checked = true;
-    }
-    outputTypeDirectInput.readOnly = disabled;
-    var outputTypeLogicTD = document.createElement("td");
-    taskTR.appendChild(outputTypeLogicTD);
-    var outputTypeLogicLabel = document.createElement("label");
-    outputTypeLogicTD.appendChild(outputTypeLogicLabel);
-    outputTypeLogicLabel.setAttribute("for", "editPolicyFormTaskOutputType" + "_" + stateName + "_" + random_suffix
-            + "_LOGIC");
-    outputTypeLogicLabel.setAttribute("class", "label-policy-taskoutputtype");
-    outputTypeLogicLabel.innerHTML = " LOGIC";
-    var outputTypeLogicInput = document.createElement("input");
-    outputTypeLogicLabel.appendChild(outputTypeLogicInput);
-    outputTypeLogicInput.setAttribute("id", "editPolicyFormTaskOutputType" + "_" + stateName + "_" + random_suffix
-            + "_LOGIC");
-    outputTypeLogicInput.setAttribute("value", "LOGIC");
-    outputTypeLogicInput.setAttribute("type", "radio");
-    outputTypeLogicInput.setAttribute("name", "editPolicyFormTaskOutputType" + "_" + stateName + "_" + random_suffix); // group
-                                                                                                                        // name
-    outputTypeLogicInput.setAttribute("class", "field-policy-taskoutputtype");
-    if (taskreference && taskSelected == null && !disabled) {
-        outputTypeLogicInput.setAttribute("class", "field-policy-taskoutputtype.new");
-    }
-    if (taskreference != null && taskreference.outputType != null && taskreference.outputType.toUpperCase() == "LOGIC") {
-        outputTypeLogicInput.checked = true;
-    }
-    outputTypeLogicInput.readOnly = disabled;
-    // output selected
-    var outputSelectionTD = document.createElement("td");
-    taskTR.appendChild(outputSelectionTD);
-    var dir_outputselected = null;
-    var logic_outputselected = null;
-    if (taskreference != null && taskreference.output != null && taskreference.output.localName != null
-            && taskreference.outputType != null && taskreference.outputType.toUpperCase() == "DIRECT") {
-        dir_outputselected = {
-            "name" : taskreference.output.localName,
-            "displaytext" : taskreference.output.localName
-        };
-    } else if (taskreference != null && taskreference.output != null && taskreference.output.localName != null
-            && taskreference.outputType != null && taskreference.outputType.toUpperCase() == "LOGIC") {
-        logic_outputselected = {
-            "name" : taskreference.output.localName,
-            "displaytext" : taskreference.output.localName
-        };
-    }
-    var dir_outputOptions = new Array();
-    if (state != null && state.stateOutputs != null && $.isArray(state.stateOutputs.entry)) {
-        for (var p = 0; p < state.stateOutputs.entry.length; p++) {
-            var outputEntry = state.stateOutputs.entry[p].key;
-            dir_outputOptions.push({
-                "name" : outputEntry,
-                "displaytext" : outputEntry
-            });
-        }
-    }
-    var logic_outputOptions = new Array();
-    if (state != null && state.stateFinalizerLogicMap != null && $.isArray(state.stateFinalizerLogicMap.entry)) {
-        for (var p = 0; p < state.stateFinalizerLogicMap.entry.length; p++) {
-            var outputEntry = state.stateFinalizerLogicMap.entry[p].key;
-            logic_outputOptions.push({
-                "name" : outputEntry,
-                "displaytext" : outputEntry
-            });
-        }
-    }
-    var dir_selectDiv = document.createElement("div");
-    dir_selectDiv.appendChild(new dropdownList("editPolicyFormTaskDirectOutputSelection" + "_" + stateName + "_"
-            + random_suffix, dir_outputOptions, dir_outputselected, disabled, null, function() {
-        return editPolicyForm_State_getDirectOutputMappingOptions(stateName);
-    }));
-    outputSelectionTD.appendChild(dir_selectDiv);
-    var logic_selectDiv = document.createElement("div");
-    logic_selectDiv.appendChild(dropdownList("editPolicyFormTaskLogicOutputSelection" + "_" + stateName + "_"
-            + random_suffix, logic_outputOptions, logic_outputselected, disabled, null, function() {
-        return editPolicyForm_State_getLogicOutputMappingOptions(stateName);
-    }));
-    outputSelectionTD.appendChild(logic_selectDiv);
-    if (outputTypeLogicInput.checked) {
-        dir_selectDiv.style.display = "none";
-        logic_selectDiv.style.display = "inline";
-    } else if (outputTypeDirectInput.checked) {
-        dir_selectDiv.style.display = "inline";
-        logic_selectDiv.style.display = "none";
-    } else {
-        dir_selectDiv.style.display = "none";
-        logic_selectDiv.style.display = "none";
-    }
-    outputTypeDirectInput.onclick = function() {
-        if (this.checked) {
-            dir_selectDiv.style.display = "inline";
-            logic_selectDiv.style.display = "none";
-        } else {
-            dir_selectDiv.style.display = "none";
-            logic_selectDiv.style.display = "inline";
-        }
-    };
-    outputTypeLogicInput.onclick = function() {
-        if (this.checked) {
-            dir_selectDiv.style.display = "none";
-            logic_selectDiv.style.display = "inline";
-        } else {
-            dir_selectDiv.style.display = "inline";
-            logic_selectDiv.style.display = "none";
-        }
-    };
-}
-
-function editPolicyForm_State_getLogicOutputMappingOptions(statename) {
-    var outputoptions = new Array();
-    var finalizerstablerows = document.getElementById("editPolicyFormLogicOutputsTable_" + statename).rows;
-    if (finalizerstablerows && finalizerstablerows.length > 2) { // has head
-                                                                    // so just
-                                                                    // ignore
-                                                                    // (2) top
-                                                                    // row and
-                                                                    // bottom
-                                                                    // row
-        for (var i = 1; i < finalizerstablerows.length - 1; i++) {
-            var finalizerTR = finalizerstablerows[i];
-            if (finalizerTR && finalizerTR.getAttribute("finalizer_id")) {
-                var finalizer_id = finalizerTR.getAttribute("finalizer_id");
-                var finalizerlocalname = document.getElementById("editPolicyFormLogicOutputNameValue_" + statename
-                        + "_" + finalizer_id).value;
-                if (finalizerlocalname != null && finalizerlocalname != "") {
-                    outputoptions.push({
-                        "name" : finalizerlocalname,
-                        "displaytext" : finalizerlocalname
-                    });
-                }
-            }
-        }
-    }
-    return outputoptions;
-}
-
-function editPolicyForm_State_getDirectOutputMappingOptions(statename) {
-    var outputoptions = new Array();
-    var outputstablerows = document.getElementById("editPolicyFormDirOutputsTable_" + statename).rows;
-    if (outputstablerows && outputstablerows.length > 2) { // has head so just
-                                                            // ignore (2) top
-                                                            // row and bottom
-                                                            // row
-        for (var i = 1; i < outputstablerows.length - 1; i++) {
-            var outputTR = outputstablerows[i];
-            if (outputTR && outputTR.getAttribute("output_id")) {
-                var output_id = outputTR.getAttribute("output_id");
-                var outputlocalname = document.getElementById("editPolicyFormDirectOutputNameValue_" + statename + "_"
-                        + output_id).value;
-                if (outputlocalname != null && outputlocalname != "") {
-                    outputoptions.push({
-                        "name" : outputlocalname,
-                        "displaytext" : outputlocalname
-                    });
-                }
-            }
-        }
-    }
-    return outputoptions;
-}
-
-function editPolicyForm_State_getStateBean(statename) {
-    if (statename == null || statename == "") {
-        console.error("Request for '" + statename + "' state!");
-        alert("Request for '" + statename + "' state!");
-        return null;
-    }
-    var div = document.getElementById("editPolicyFormStateDiv_" + statename);
-    if (div == null) {
-        console.error("State information requested for state " + statename + ", but that state does not exist!")
-        alert("State information requested for state " + statename + ", but that state does not exist!");
-        return null;
-    }
-    var ret = new Object();
-    // name
-    ret["name"] = statename;
-    // trigger
-    var triggervalue = document.getElementById("editPolicyFormTrigger_" + statename + "_dropdownList").selectedOption;
-    ret["trigger"] = null;
-    if (triggervalue != null && triggervalue.event != null) {
-        ret.trigger = {
-            "name" : triggervalue.event.key.name,
-            "version" : triggervalue.event.key.version
-        };
-    }
-    // context
-    var statebean_context = new Array();
-    var contextstablerows = document.getElementById("editPolicyFormContextsTable_" + statename).rows;
-    if (contextstablerows && contextstablerows.length > 1) { // no head so
-                                                                // just ignore
-                                                                // (1) bottom
-                                                                // row
-        for (var i = 0; i < contextstablerows.length - 1; i++) {
-            var contextTR = contextstablerows[i];
-            if (contextTR && contextTR.getAttribute("context_id")) {
-                var context_id = contextTR.getAttribute("context_id");
-                var contextvalue = document.getElementById("editPolicyFormContextValue_" + statename + "_" + context_id
-                        + "_dropdownList").selectedOption;
-                if (contextvalue != null && contextvalue.album != null) {
-                    statebean_context.push({
-                        "name" : contextvalue.album.key.name,
-                        "version" : contextvalue.album.key.version
-                    });
-                }
-            }
-        }
-    }
-    ret["contexts"] = statebean_context;
-    // outputs
-    var statebean_outputs = new Object();
-    var outputstablerows = document.getElementById("editPolicyFormDirOutputsTable_" + statename).rows;
-    if (outputstablerows && outputstablerows.length > 2) { // has head so just
-                                                            // ignore (2) top
-                                                            // row and bottom
-                                                            // row
-        for (var i = 1; i < outputstablerows.length - 1; i++) {
-            var outputTR = outputstablerows[i];
-            if (outputTR && outputTR.getAttribute("output_id")) {
-                var output_id = outputTR.getAttribute("output_id");
-                var outputlocalname = document.getElementById("editPolicyFormDirectOutputNameValue_" + statename + "_"
-                        + output_id).value;
-                if (outputlocalname == null || outputlocalname == "") {
-                    console.error("No Local Name entered for Direct Output Mapping #" + i + " for state " + statename);
-                    alert("No Local Name entered for Direct Output Mapping #" + i + " for state " + statename);
-                    return null;
-                }
-                var nextstatevalue = document.getElementById("editPolicyFormOutputNextStateValue_" + statename + "_"
-                        + output_id + "_dropdownList").selectedOption;
-                var nextstatename;
-                if (nextstatevalue == null) {
-                    console.error("An option must be selected for Next State for Direct Output Mapping "
-                            + outputlocalname + " for state " + statename);
-                    alert("An option must be selected for Next State for Direct Output Mapping " + outputlocalname
-                            + " for state " + statename);
-                    return null;
-                } else if (nextstatevalue.name.toUpperCase() == "NULL") {
-                    nextstatename = null;
-                } else {
-                    nextstatename = nextstatevalue.name;
-                }
-
-                var nexteventvalue = document.getElementById("editPolicyFormOutputEventValue_" + statename + "_"
-                        + output_id + "_dropdownList").selectedOption;
-                if (nexteventvalue == null || nexteventvalue.event == null || nexteventvalue.event.key == null) {
-                    console.error("No Output Event selected for Direct Output Mapping " + outputlocalname
-                            + " for state " + statename);
-                    alert("No Output Event selected for Direct Output Mapping " + outputlocalname + " for state "
-                            + statename);
-                    return null;
-                }
-                var nextevent = {
-                    "name" : nexteventvalue.event.key.name,
-                    "version" : nexteventvalue.event.key.version
-                };
-                statebean_outputs[outputlocalname] = {
-                    "event" : nextevent,
-                    "nextState" : nextstatename
-                };
-            }
-        }
-    }
-    ret["stateOutputs"] = statebean_outputs;
-    // finalizers
-    var statebean_finalizers = new Object();
-    var finalizerstablerows = document.getElementById("editPolicyFormLogicOutputsTable_" + statename).rows;
-    if (finalizerstablerows && finalizerstablerows.length > 2) { // has head
-                                                                    // so just
-                                                                    // ignore
-                                                                    // (2) top
-                                                                    // row and
-                                                                    // bottom
-                                                                    // row
-        for (var i = 1; i < finalizerstablerows.length - 1; i++) {
-            var finalizerTR = finalizerstablerows[i];
-            if (finalizerTR && finalizerTR.getAttribute("finalizer_id")) {
-                var finalizer_id = finalizerTR.getAttribute("finalizer_id");
-                var finalizerlocalname = document.getElementById("editPolicyFormLogicOutputNameValue_" + statename
-                        + "_" + finalizer_id).value;
-                if (finalizerlocalname == null || finalizerlocalname == "") {
-                    console.error("No Local Name entered for Logic-based Output Mapping #" + i + " for state "
-                            + statename);
-                    alert("No Local Name entered for Logic-based Output Mapping #" + i + " for state " + statename);
-                    return null;
-                }
-
-                var finalizerlogicvalue = document.getElementById("editEventFormfinalizerLogicInput_" + statename + "_"
-                        + finalizer_id + "_textarea").value;
-                if (finalizerlogicvalue == null || finalizerlogicvalue == "") {
-                    console.error("No Logic is specified for Logic-based Output Mapping " + finalizerlocalname
-                            + " for state " + statename);
-                    alert("No Logic is specified for Logic-based Output Mapping " + finalizerlocalname + " for state "
-                            + statename);
-                    return null;
-                }
-
-                var finalizerlogictypevalue = document.getElementById("editPolicyFormFinalizerLogicTypeInput_"
-                        + statename + "_" + finalizer_id).value;
-                if (finalizerlogictypevalue == null || finalizerlogictypevalue == "") {
-                    console.error("No Logic Type is specified for Logic-based Output Mapping " + finalizerlocalname
-                            + " for state " + statename);
-                    alert("No Logic Type is specified for Logic-based Output Mapping " + finalizerlocalname
-                            + " for state " + statename);
-                    return null;
-                }
-                statebean_finalizers[finalizerlocalname] = {
-                    "logic" : finalizerlogicvalue,
-                    "logicFlavour" : finalizerlogictypevalue
-                };
-            }
-        }
-    }
-    ret["finalizers"] = statebean_finalizers;
-    // tasks & defaulttask
-    var statebean_tasks = new Object();
-    var statebean_defaultTask = null;
-    var taskstablerows = document.getElementById("editPolicyFormTasksTable_" + statename).rows;
-    if (taskstablerows == null || taskstablerows.length <= 2) {
-        alert("No tasks selected for state " + statename);
-        console.error("No tasks selected for state " + statename);
-        return null;
-    } else { // has head so just ignore (2) top row and bottom row
-        for (var i = 1; i < taskstablerows.length - 1; i++) {
-            var taskTR = taskstablerows[i];
-            if (taskTR && taskTR.getAttribute("task_id")) {
-                var task_id = taskTR.getAttribute("task_id");
-                var tasklocalname = document.getElementById("editPolicyFormTaskLocalNameValue_" + statename + "_"
-                        + task_id).value;
-                if (tasklocalname == "") {
-                    console.error("No Local Name entered for task #" + i + " for state " + statename);
-                    alert("No Local Name entered for task #" + i + " for state " + statename);
-                    return null;
-                }
-                if (statebean_tasks[tasklocalname] != null) {
-                    console.error("There cannot be more than one task called " + tasklocalname + " for state "
-                            + statename);
-                    alert("There cannot be more than one task called " + tasklocalname + " for state " + statename);
-                    return null;
-                }
-                var taskvalue = document.getElementById("editPolicyFormTaskValue_" + statename + "_" + task_id
-                        + "_dropdownList").selectedOption;
-                if (taskvalue == null || taskvalue.task == null) {
-                    console.error("No Task selected for task " + tasklocalname + " for state " + statename);
-                    alert("No Task selected for task " + tasklocalname + " for state " + statename);
-                    return null;
-                }
-                var task = taskvalue.task;
-                var r = document.querySelector('input[name="editPolicyFormTaskOutputType_' + statename + '_' + task_id
-                        + '"]:checked');
-                if (r == null) {
-                    console.error("No Output Mapping type selected for task " + tasklocalname + " for state "
-                            + statename);
-                    alert("No Output Mapping type selected for task " + tasklocalname + " for state " + statename);
-                    return null;
-                }
-                var outputtype = r.value;
-                var outputname = null;
-                if (outputtype == "DIRECT") {
-                    var diroutput = document.getElementById("editPolicyFormTaskDirectOutputSelection_" + statename
-                            + "_" + task_id + "_dropdownList").selectedOption;
-                    if (diroutput == null) {// } || diroutput.output == null){
-                        console.error("No DIRECT Output Mapping selected for task " + tasklocalname + " for state "
-                                + statename);
-                        alert("No DIRECT Output Mapping selected for task " + tasklocalname + " for state " + statename);
-                    }
-                    outputname = diroutput.name;
-                } else if (outputtype == "LOGIC") {
-                    var logoutput = document.getElementById("editPolicyFormTaskLogicOutputSelection_" + statename + "_"
-                            + task_id + "_dropdownList").selectedOption;
-                    if (logoutput == null || logoutput.name == null) {
-                        console.error("No LOGIC Output Mapping selected for task " + tasklocalname + " for state "
-                                + statename);
-                        alert("No LOGIC Output Mapping selected for task " + tasklocalname + " for state " + statename);
-                    }
-                    outputname = logoutput.name;
-                } else {
-                    console.error("Unknown Output Mapping type ('" + outputtype + "') selected for task "
-                            + tasklocalname + " for state " + statename);
-                    alert("Unknown Output Mapping type ('" + outputtype + "') selected for task " + tasklocalname
-                            + " for state " + statename);
-                    return null;
-                }
-                statebean_tasks[tasklocalname] = {
-                    "task" : {
-                        "name" : task.key.name,
-                        "version" : task.key.version
-                    },
-                    "outputType" : outputtype,
-                    "outputName" : outputname
-                };
-
-                var r2 = document.getElementById("editPolicyFormTaskIsDefault_" + statename + "_" + task_id);
-                if (taskstablerows.length <= 3 || (r2 != null && r2.checked == true)) { // default
-                                                                                        // is
-                                                                                        // checked
-                                                                                        // or
-                                                                                        // there
-                                                                                        // is
-                                                                                        // only
-                                                                                        // one
-                                                                                        // task
-                    statebean_defaultTask = {
-                        "name" : task.key.name,
-                        "version" : task.key.version
-                    };
-                }
-
-            }
-        }
-    }
-    ret["tasks"] = statebean_tasks;
-    ret["defaultTask"] = statebean_defaultTask;
-    // tasksellogic
-    var tsl = document.getElementById("editEventFormTaskSelLogicInput_" + statename + "_textarea").value;
-    var tsl_type = document.getElementById("editPolicyFormTaskSelLogicTypeInput_" + statename).value;
-    if (tsl == null || tsl == "" || tsl_type == null || tsl_type == "") {
-        if (statebean_tasks != null && taskstablerows.length > 3) { // there is
-                                                                    // more than
-                                                                    // 1 task
-            console
-                    .error("State "
-                            + statename
-                            + " has more than one task reference so Task Selection Logic and Task Selection Logic type must be specified");
-            alert("State "
-                    + statename
-                    + " has more than one task reference so Task Selection Logic and Task Selection Logic type must be specified");
-            return null;
-        }
-    } else if ((tsl == null || tsl == "") && (tsl_type == null || tsl_type == "")) {
-        ret["taskSelectionLogic"] = null;
-    } else {
-        ret["taskSelectionLogic"] = {
-            "logic" : tsl,
-            "logicFlavour" : tsl_type
-        };
-    }
-
-    return ret;
-
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexPolicyTab.js b/client/client-editor/src/main/resources/webapp/js/ApexPolicyTab.js
deleted file mode 100644
index cda24928c..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexPolicyTab.js
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function policyTab_reset() {
-    policyTab_deactivate();
-    policyTab_activate();
-}
-
-function policyTab_activate() {
-    policyTab_create();
-    
-    var requestURL = restRootURL + "/Policy/Get?name=&version=";
-
-    ajax_get(requestURL, function(data) {
-        $("#policyTableBody").find("tr:gt(0)").remove();
-        
-        for (var i = 0; i < data.messages.message.length; i++) {
-            var policy = JSON.parse(data.messages.message[i]).apexPolicy;
-
-            var policyRow_tr = document.createElement("tr");
-            var policyid = policy.policyKey.name + ":"  + policy.policyKey.version;
-            
-            var policyTableRow = 
-                "<td>"              +
-                policyid            +
-                "</td>"             +
-                "<td>"              +
-                policy.template       +
-                "</td>"              +
-                "<td>"                +
-                policy.firstState     +
-                "</td>";
-
-            policyTableRow += "<td><table class='ebTable'><thead><tr class='headerRow'><th>State</th><th>Trigger</th><th>Referenced Tasks</th><th>Default Task</th>";
-            policyTableRow += "<th>TSL</th><th>State Outputs</th><th>State Finsalizer Logic</th><th>Context Album References</th></tr></thead><tbody>";
-            
-            var states = policy.state.entry;
-            for(var s in states) {
-                var state = states[s];
-                if(state.key == policy.firstState) {
-                    states.splice(s, 1);
-                    states.unshift(state);
-                    break;
-                }
-            }
-            
-            for (var s = 0; s < policy.state.entry.length; s++) {
-                var stateName = policy.state.entry[s].key;
-                var state     = policy.state.entry[s].value;
-
-                policyTableRow +=
-                    "<tr><td>"                                            +
-                    stateName                                             +
-                    "</td>"                                               +
-                    "<td>"                                                +
-                    state.trigger.name     + ":"  + state.trigger.version +
-                    "</td>";
-                
-                policyTableRow += "<td><table class='ebTable'><thead><tr class='headerRow'><th>Task Reference</th><th>Output Type</th><th>Output</th></thead><tbody>";
-                for (var t = 0; t < state.taskReferences.entry.length; t++) {
-                    var taskKey = state.taskReferences.entry[t].key;
-                    var taskRef = state.taskReferences.entry[t].value;
-                    
-                    policyTableRow +=
-                        "<tr><td>"                +
-                        taskKey.name              + ":" + taskKey.version +
-                        "</td>"                   +
-                        "<td>"                    +
-                        taskRef.outputType        +
-                        "</td>"                   +
-                        "<td>"                    +
-                        taskRef.output.localName  +
-                        "</td>";
-                }
-                policyTableRow += "</tbody></table></td>";
-
-                policyTableRow +=
-                    "<td>"                                                    +
-                    state.defaultTask.name                + ":"  + state.defaultTask.version +
-                    "</td>"                               +
-                    "<td>"                                +
-                    state.taskSelectionLogic.logicFlavour +
-                    "</td>";
-
-                policyTableRow += "<td><table class='ebTable'><thead><tr class='headerRow'><th>Name</th><th>Next State</th><th>Event</th></thead><tbody>";
-                for (var o = 0; o < state.stateOutputs.entry.length; o++) {
-                    var outputEntry = state.stateOutputs.entry[o];
-
-                    policyTableRow +=
-                        "<tr><td>"                             +
-                        outputEntry.key                        +
-                        "</td>"                                +
-                        "<td>"                                 +
-                        outputEntry.value.nextState.localName  +
-                        "</td>"                                +
-                        "<td>"                                 +
-                        outputEntry.value.outgoingEvent.name + ":" + outputEntry.value.outgoingEvent.version +
-                        "</td>";
-                }
-                policyTableRow += "</tbody></table></td>";
-            
-                policyTableRow += "<td><table class='ebTable'><thead><tr class='headerRow'><th>Name</th><th>Type</th></thead><tbody>";
-                for (var sf = 0; sf < state.stateFinalizerLogicMap.entry.length; sf++) {
-                    var sflEntry = state.stateFinalizerLogicMap.entry[sf];
-
-                    policyTableRow +=
-                        "<tr><td>"                  +
-                        sflEntry.key                +
-                        "</td>"                     +
-                        "<td>"                      +
-                        sflEntry.value.logicFlavour +
-                        "</td>";
-                }
-                policyTableRow += "</tbody></table></td>";
-            
-                
-                policyTableRow += "<td><table class='ebTable'><tbody>";
-                for (var c = 0; c < state.contextAlbumReference.length; c++) {
-                    var contextAlbumReference = state.contextAlbumReference[c];
-
-                    policyTableRow +=
-                        "<tr><td>"  +
-                        contextAlbumReference.name + ":" + contextAlbumReference.version +
-                        "</td></tr>";
-                }
-                policyTableRow += "</tbody></table></td></tr>";
-
-                policyTableRow += "</tr>";
-            }
-
-            policyTableRow += "</tbody></table></td>";
-
-
-            policyRow_tr.innerHTML = policyTableRow; 
-            policyRow_tr.addEventListener('contextmenu', rightClickMenu_scopePreserver("policyTabContent", "Policy", policy.policyKey.name, policy.policyKey.version));  
-
-            $("#policyTableBody").append(policyRow_tr);
-        }
-    });
-}
-
-function policyTab_deactivate() {
-    apexUtils_removeElement("policyTabContent");
-}
-
-function policyTab_create() {
-    var policyTab = document.getElementById("policiesTab");
-
-    var policyTabContent = document.getElementById("policyTabContent");
-    if (policyTabContent != null) {
-        return
-    }
-
-    var policyTabContent = document.createElement("policyTabContent");
-    policyTab.appendChild(policyTabContent);
-    policyTabContent.setAttribute("id", "policyTabContent");
-    policyTabContent.addEventListener('contextmenu', rightClickMenu_scopePreserver("policyTabContent", "Policy", null, null));  
-
-    var policyTable = createTable("policyTable");
-    policyTabContent.appendChild(policyTable);
-
-    var policyTableHeader = document.createElement("thead");
-    policyTable.appendChild(policyTableHeader);
-    policyTableHeader.setAttribute("id", "policyTableHeader");
-
-    var policyTableHeaderRow = document.createElement("tr");
-    policyTableHeader.appendChild(policyTableHeaderRow);
-    policyTableHeaderRow.setAttribute("id", "policyTableHeaderRow");
-
-    var policyTableKeyHeader = document.createElement("th");
-    policyTableHeaderRow.appendChild(policyTableKeyHeader);
-    policyTableKeyHeader.setAttribute("id", "policyTableKeyHeader");
-    policyTableKeyHeader.appendChild(document.createTextNode("Policy"));
-
-    var policyTableTemplateHeader = document.createElement("th");
-    policyTableHeaderRow.appendChild(policyTableTemplateHeader);
-    policyTableTemplateHeader.setAttribute("id", "policyTableTemplateHeader");
-    policyTableTemplateHeader.appendChild(document.createTextNode("Template"));
-
-    var policyTableFirstStateHeader = document.createElement("th");
-    policyTableHeaderRow.appendChild(policyTableFirstStateHeader);
-    policyTableFirstStateHeader.setAttribute("id", "policyTableFirstStateHeader");
-    policyTableFirstStateHeader.appendChild(document.createTextNode("First State"));
-
-    var policyTableStatesHeader = document.createElement("th");
-    policyTableHeaderRow.appendChild(policyTableStatesHeader);
-    policyTableStatesHeader.setAttribute("id", "policyTableStatesHeader");
-    policyTableStatesHeader.appendChild(document.createTextNode("States"));
-
-    var policyTableBody = document.createElement("tbody");
-    policyTable.appendChild(policyTableBody);
-    policyTable.setAttribute("id", "policyTableBody");
-}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexResultForm.js b/client/client-editor/src/main/resources/webapp/js/ApexResultForm.js
deleted file mode 100644
index 123643b93..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexResultForm.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function resultForm_activate(formParent, formHeading, formText) {
-    apexUtils_removeElement("newModelDivBackground");
-
-    var contentelement = document.createElement("resultFormDiv");
-    var formDiv = document.createElement("div");
-    var backgroundDiv = document.createElement("div");
-    backgroundDiv.setAttribute("id", "newModelDivBackground");
-    backgroundDiv.setAttribute("class", "newModelDivBackground");
-
-    backgroundDiv.appendChild(formDiv);
-    contentelement.appendChild(backgroundDiv);
-    formParent.appendChild(contentelement);
-
-    formDiv.setAttribute("id", "resultFormDiv");
-    formDiv.setAttribute("class", "resultFormDiv");
-
-    var headingSpan = document.createElement("span");
-    formDiv.appendChild(headingSpan);
-
-    headingSpan.setAttribute("class", "headingSpan");
-    headingSpan.innerHTML = formHeading;
-
-    var form = document.createElement("resultForm");
-    formDiv.appendChild(form);
-
-    form.setAttribute("id", "resultForm");
-    form.setAttribute("class", "form-style-1");
-    form.setAttribute("method", "post");
-
-    var ul = document.createElement("ul");
-    form.appendChild(ul);
-
-    var resultTextLI = document.createElement("li");
-    form.appendChild(resultTextLI);
-
-    var resultTextLabel = document.createElement("label");
-    resultTextLI.appendChild(resultTextLabel);
-    resultTextLabel.setAttribute("for", "resultFormTextArea");
-    resultTextLabel.innerHTML = "resultText: ";
-
-    var resultTextArea = document.createElement("textarea");
-    resultTextLI.appendChild(resultTextArea);
-
-    resultTextArea.setAttribute("id", "resultFormTextArea");
-    resultTextArea.setAttribute("resultText", "resultFormTextArea");
-    resultTextArea.setAttribute("class", "field-long field-textarea ebTextArea ebTextArea_width_full eb_scrollbar");
-    resultTextArea.setAttribute("readonly", "readonly");
-    resultTextArea.style.cursor = "text";
-
-    resultTextArea.value = formText;
-
-    var inputLI = document.createElement("li");
-    form.appendChild(inputLI);
-
-    var okInput = document.createElement("input");
-    inputLI.appendChild(okInput);
-
-    okInput.setAttribute("id", "generateDescription");
-    okInput.setAttribute("class", "okButton ebBtn");
-    okInput.setAttribute("type", "submit");
-    okInput.setAttribute("value", "OK");
-
-    okInput.onclick = resultForm_okPressed;
-}
-
-function resultForm_okPressed() {
-    apexUtils_removeElement("newModelDivBackground");
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexTable.js b/client/client-editor/src/main/resources/webapp/js/ApexTable.js
deleted file mode 100644
index af5e7e3db..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexTable.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function createTable(id) {
-    var table = document.createElement("table");
-    table.setAttribute("id", id);
-    table.setAttribute("class", "apexTable ebTable elTablelib-Table-table ebTable_striped");
-    return table;
-}
-
-function setRowHover(rowElement) {
-    rowElement.className = "ebTableRow";
-    rowElement.onmouseover = function() {
-        this.className = "ebTableRow ebTableRow_hover";
-    };
-    rowElement.onmouseout = function() {
-        this.className = "ebTableRow";
-    };
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexTaskEditForm.js b/client/client-editor/src/main/resources/webapp/js/ApexTaskEditForm.js
deleted file mode 100644
index d4021c003..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexTaskEditForm.js
+++ /dev/null
@@ -1,1003 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function editTaskForm_createTask(formParent) {
-    // Get all contextSchemas too for task input/outputfields
-    var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
-    var contextSchemas = new Array();
-    ajax_get(requestURL, function(data2) {
-        for (var i = 0; i < data2.messages.message.length; i++) {
-            var contextSchema = JSON.parse(data2.messages.message[i]).apexContextSchema;
-            var dt = {
-                "name" : contextSchema.key.name,
-                "version" : contextSchema.key.version,
-                "displaytext" : contextSchema.key.name + ":" + contextSchema.key.version,
-                "contextSchema" : contextSchema
-            };
-            contextSchemas.push(dt);
-        }
-        // Get all contextAlbums too for task context album references
-        var requestURL = restRootURL + "/ContextAlbum/Get?name=&version=";
-        var contextAlbums = new Array();
-        ajax_get(requestURL, function(data3) {
-            for (var i = 0; i < data3.messages.message.length; i++) {
-                var contextAlbum = JSON.parse(data3.messages.message[i]).apexContextAlbum;
-                var ca = {
-                    "name" : contextAlbum.key.name,
-                    "version" : contextAlbum.key.version,
-                    "displaytext" : contextAlbum.key.name + ":" + contextAlbum.key.version,
-                    "contextAlbum" : contextAlbum
-                };
-                contextAlbums.push(ca);
-            }
-            editTaskForm_activate(formParent, "CREATE", null, contextSchemas, contextAlbums);
-        });
-    });
-}
-
-function editTaskForm_deleteTask(parent, name, version) {
-    var message = "Are you sure you want to delete Task \"" + name + ":" + version + "\"?";
-    if (apexUtils_areYouSure(message)) {
-        var requestURL = restRootURL + "/Task/Delete?name=" + name + "&version=" + version;
-        ajax_delete(requestURL, function(data) {
-            apexUtils_removeElement("editTaskFormDiv");
-            taskTab_reset();
-            keyInformationTab_reset()
-        });
-    }
-}
-
-function editTaskForm_viewTask(formParent, name, version) {
-    editTaskForm_editTask_inner(formParent, name, version, "VIEW");
-}
-
-function editTaskForm_editTask(formParent, name, version) {
-    editTaskForm_editTask_inner(formParent, name, version, "EDIT");
-}
-
-function editTaskForm_editTask_inner(formParent, name, version, viewOrEdit) {
-    var requestURL = restRootURL + "/Task/Get?name=" + name + "&version=" + version;
-    ajax_getWithKeyInfo(requestURL, "apexTask", function(task) {
-        // Get all contextSchemas too for task inputfields
-        var requestURL = restRootURL + "/ContextSchema/Get?name=&version=";
-        var contextSchemas = new Array();
-        ajax_get(requestURL, function(data2) {
-            for (var i = 0; i < data2.messages.message.length; i++) {
-                var contextSchema = JSON.parse(data2.messages.message[i]).apexContextSchema;
-                contextSchemas.push({
-                    "name" : contextSchema.key.name,
-                    "version" : contextSchema.key.version,
-                    "displaytext" : contextSchema.key.name + ":" + contextSchema.key.version,
-                    "contextSchema" : contextSchema
-                });
-            }
-            // Get all contextAlbums too for task context album references
-            var requestURL = restRootURL + "/ContextAlbum/Get?name=&version=";
-            var contextAlbums = new Array();
-            ajax_get(requestURL, function(data3) {
-                for (var i = 0; i < data3.messages.message.length; i++) {
-                    var contextAlbum = JSON.parse(data3.messages.message[i]).apexContextAlbum;
-                    var ca = {
-                        "name" : contextAlbum.key.name,
-                        "version" : contextAlbum.key.version,
-                        "displaytext" : contextAlbum.key.name + ":" + contextAlbum.key.version,
-                        "contextAlbum" : contextAlbum
-                    };
-                    contextAlbums.push(ca);
-                }
-                editTaskForm_activate(formParent, viewOrEdit, task, contextSchemas, contextAlbums);
-            });
-        });
-    });
-}
-
-function editTaskForm_activate(parent, operation, task, contextSchemas, contextAlbums) {
-    apexUtils_removeElement("editTaskFormDiv");
-    var formParent = document.getElementById(parent);
-    apexUtils_emptyElement(parent);
-
-    var isedit = false;
-    var createEditOrView = "";
-
-    if (!operation) {
-        console.warn("No operation specified for TaskForm form")
-    } else {
-        createEditOrView = operation.toUpperCase();
-    }
-
-    if (createEditOrView == "CREATE") {
-        isedit = true;
-    } else if (createEditOrView == "EDIT" || createEditOrView == "VIEW") {
-        if (createEditOrView == "EDIT") {
-            isedit = true;
-        }
-
-        if (!task) {
-            console.warn("Invalid value (\"" + task + "\") passed as a value for \"task\" for TaskForm form.");
-        } else {
-            if (!task.key || !task.key.name || task.key.name == "") {
-                console.warn("Invalid value (\"" + task.key.name
-                        + "\") passed as a value for \"name\" for TaskForm form.");
-            }
-            if (!task.key || !task.key.version || task.key.version == "") {
-                console.warn("Invalid value (\"" + task.key.version
-                        + "\") passed as a value for \"version\" for TaskForm form.");
-            }
-            if (!task.uuid || task.uuid == "") {
-                console.warn("Invalid value (\"" + task.uuid + "\") passed as a value for \"uuid\" for TaskForm form.");
-            }
-        }
-    } else {
-        console.warn("Invalid operation (\"" + operation
-                + "\") specified for TaskForm form. Only \"Create\", \"Edit\" and \"View\" operations are supported");
-    }
-
-    var contentelement = document.createElement("editTaskFormDiv");
-    var formDiv = document.createElement("div");
-    contentelement.appendChild(formDiv);
-    formDiv.setAttribute("id", "editTaskFormDiv");
-    formDiv.setAttribute("class", "editTaskFormDiv");
-
-    var headingSpan = document.createElement("h2");
-    formDiv.appendChild(headingSpan);
-    headingSpan.innerHTML = "Task Editor";
-
-    var form = document.createElement("editTaskForm");
-    formDiv.appendChild(form);
-
-    form.setAttribute("id", "editTaskForm");
-    form.setAttribute("class", "form-style-1");
-    form.setAttribute("method", "post");
-    form.setAttribute("createEditOrView", createEditOrView);
-
-    var formul = document.createElement("ul");
-    form.appendChild(formul);
-
-    var nameLI = document.createElement("li");
-    formul.appendChild(nameLI);
-    var nameLabel = document.createElement("label");
-    nameLI.appendChild(nameLabel);
-    nameLabel.setAttribute("for", "editTaskFormNameInput");
-    nameLabel.innerHTML = "Name: ";
-    var nameLabelSpan = document.createElement("span");
-    nameLabel.appendChild(nameLabelSpan);
-    nameLabelSpan.setAttribute("class", "required");
-    nameLabelSpan.innerHTML = "*";
-    var nameInput = document.createElement("input");
-    nameLI.appendChild(nameInput);
-    nameInput.setAttribute("id", "editTaskFormNameInput");
-    nameInput.setAttribute("type", "text");
-    nameInput.setAttribute("name", "editTaskFormNameInput");
-    nameInput.setAttribute("class", "field ebInput");
-    nameInput.setAttribute("placeholder", "name");
-    if (task && task.key && task.key.name) {
-        nameInput.value = task.key.name;
-    }
-    if (createEditOrView != "CREATE") {
-        nameInput.readOnly = true;
-    }
-
-    var versionLI = document.createElement("li");
-    formul.appendChild(versionLI);
-    var versionLabel = document.createElement("label");
-    versionLI.appendChild(versionLabel);
-    versionLabel.setAttribute("for", "editTaskFormVersionInput");
-    versionLabel.innerHTML = "Version: ";
-    var versionInput = document.createElement("input");
-    versionLI.appendChild(versionInput);
-    versionInput.setAttribute("id", "editTaskFormVersionInput");
-    versionInput.setAttribute("type", "text");
-    versionInput.setAttribute("name", "editTaskFormVersionInput");
-    versionInput.setAttribute("class", "field ebInput");
-    versionInput.setAttribute("placeholder", "0.0.1");
-    if (task && task.key && task.key.version) {
-        versionInput.value = task.key.version;
-    }
-    if (createEditOrView != "CREATE") {
-        versionInput.readOnly = true;
-    }
-
-    var uuidLI = document.createElement("li");
-    formul.appendChild(uuidLI);
-    var uuidLabel = document.createElement("label");
-    uuidLI.appendChild(uuidLabel);
-    uuidLabel.setAttribute("for", "editTaskFormUuidInput");
-    uuidLabel.innerHTML = "UUID: ";
-    var uuidInput = document.createElement("input");
-    uuidLI.appendChild(uuidInput);
-    uuidInput.setAttribute("id", "editTaskFormUuidInput");
-    uuidInput.setAttribute("type", "text");
-    uuidInput.setAttribute("name", "editTaskFormUuidInput");
-    uuidInput.setAttribute("class", "field-long ebInput ebInput_width_full");
-    uuidInput.setAttribute("placeholder", "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
-    if (task && task.uuid) {
-        uuidInput.value = task.uuid;
-    }
-    if (createEditOrView != "CREATE") {
-        uuidInput.readOnly = true;
-    }
-
-    var edit_disabled = (createEditOrView != "CREATE" && createEditOrView != "EDIT");
-
-    // description
-    var descriptionLI = document.createElement("li");
-    formul.appendChild(descriptionLI);
-    var descriptionLabel = document.createElement("label");
-    descriptionLI.appendChild(descriptionLabel);
-    descriptionLabel.setAttribute("for", "editTaskFormDescriptionTextArea");
-    descriptionLabel.innerHTML = "Description: ";
-    var descriptionTextArea = document.createElement("textarea");
-    descriptionLI.appendChild(descriptionTextArea);
-    descriptionTextArea.setAttribute("id", "editTaskFormDescriptionTextArea");
-    descriptionTextArea.setAttribute("name", "editTaskFormDescriptionTextArea");
-    descriptionTextArea.setAttribute("class", "field-long field-textarea ebTextArea ebTextArea_width_full");
-    if (task && task.description) {
-        descriptionTextArea.value = task.description;
-    }
-    descriptionTextArea.readOnly = edit_disabled;
-
-    // input fields
-    var inputfieldsLI = document.createElement("li");
-    formul.appendChild(inputfieldsLI);
-    var inputfieldsLabel = document.createElement("label");
-    inputfieldsLI.appendChild(inputfieldsLabel);
-    inputfieldsLabel.setAttribute("for", "editTaskFormInputFieldsTable");
-    inputfieldsLabel.innerHTML = "Task Input Fields: ";
-    var inputfieldstable = document.createElement("table");
-    inputfieldstable.setAttribute("id", "editTaskFormInputFieldsTable");
-    inputfieldstable.setAttribute("name", "editTaskFormInputFieldsTable");
-    inputfieldstable.setAttribute("class", "table-taskinputfield");
-    inputfieldsLI.appendChild(inputfieldstable);
-    var inputfieldstable_head = document.createElement("thead");
-    inputfieldstable.appendChild(inputfieldstable_head);
-    var inputfieldstable_head_tr = document.createElement("tr");
-    inputfieldstable_head.appendChild(inputfieldstable_head_tr);
-    inputfieldstable_head_tr.appendChild(document.createElement("th")); // empty,
-                                                                        // for
-                                                                        // delete
-                                                                        // button
-    var inputfieldstable_head_th = document.createElement("th");
-    inputfieldstable_head_tr.appendChild(inputfieldstable_head_th);
-    inputfieldstable_head_th.innerHTML = "Input Field Name: ";
-    inputfieldstable_head_th.setAttribute("class", "table-taskinputfield-heading form-heading");
-    inputfieldstable_head_th = document.createElement("th");
-    inputfieldstable_head_tr.appendChild(inputfieldstable_head_th);
-    inputfieldstable_head_th.innerHTML = "Input Field Type/Schema: ";
-    inputfieldstable_head_th.setAttribute("class", "table-taskinputfield-heading form-heading");
-    inputfieldstable_head_th = document.createElement("th");
-    inputfieldstable_head_tr.appendChild(inputfieldstable_head_th);
-    inputfieldstable_head_th.innerHTML = "Optional: ";
-    inputfieldstable_head_th.setAttribute("class", "table-eventparam-heading form-heading");
-    var inputfieldstable_body = document.createElement("tbody");
-    inputfieldstable.appendChild(inputfieldstable_body);
-    // Add the inputfields
-    if (task && task.inputFields && task.inputFields.entry) {
-        for (var p = 0; p < task.inputFields.entry.length; p++) {
-            var inputfieldEntry = task.inputFields.entry[p];
-            var contextSchema = inputfieldEntry.value.fieldSchemaKey;
-            contextSchema["displaytext"] = contextSchema.name + ":" + contextSchema.version;
-            editTaskForm_addTaskInputField(inputfieldstable_body, (createEditOrView == "VIEW"), inputfieldEntry.key,
-                    inputfieldEntry.value.optional, contextSchema, contextSchemas);
-        }
-    }
-    // add the New Input Field button
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var inputfieldTR = document.createElement("tr");
-        inputfieldTR.setAttribute("class", "field-taskinputfield-tr.new");
-        inputfieldstable_body.appendChild(inputfieldTR);
-        var inputfieldTD = document.createElement("td");
-        inputfieldTD.setAttribute("colspan", "3");
-        inputfieldTR.appendChild(inputfieldTD);
-        var addInputFieldInput = createAddFormButton();
-        inputfieldTD.appendChild(addInputFieldInput);
-        addInputFieldInput.onclick = function() {
-            editTaskForm_addTaskInputField(inputfieldstable_body, false, null, false, null, contextSchemas);
-        };
-    }
-
-    // output fields
-    var outputfieldsLI = document.createElement("li");
-    formul.appendChild(outputfieldsLI);
-    var outputfieldsLabel = document.createElement("label");
-    outputfieldsLI.appendChild(outputfieldsLabel);
-    outputfieldsLabel.setAttribute("for", "editTaskFormOutputFieldsTable");
-    outputfieldsLabel.innerHTML = "Task Output Fields: ";
-    var outputfieldstable = document.createElement("table");
-    outputfieldstable.setAttribute("id", "editTaskFormOutputFieldsTable");
-    outputfieldstable.setAttribute("name", "editTaskFormOutputFieldsTable");
-    outputfieldstable.setAttribute("class", "table-taskoutputfield");
-    outputfieldsLI.appendChild(outputfieldstable);
-    var outputfieldstable_head = document.createElement("thead");
-    outputfieldstable.appendChild(outputfieldstable_head);
-    var outputfieldstable_head_tr = document.createElement("tr");
-    outputfieldstable_head.appendChild(outputfieldstable_head_tr);
-    outputfieldstable_head_tr.appendChild(document.createElement("th")); // empty,
-                                                                            // for
-                                                                            // delete
-                                                                            // button
-    var outputfieldstable_head_th = document.createElement("th");
-    outputfieldstable_head_tr.appendChild(outputfieldstable_head_th);
-    outputfieldstable_head_th.innerHTML = "Output Field Name: ";
-    outputfieldstable_head_th.setAttribute("class", "table-taskoutputfield-heading form-heading");
-    outputfieldstable_head_th = document.createElement("th");
-    outputfieldstable_head_tr.appendChild(outputfieldstable_head_th);
-    outputfieldstable_head_th.innerHTML = "Output Field Type/Schema: ";
-    outputfieldstable_head_th.setAttribute("class", "table-taskoutputfield-heading form-heading");
-    outputfieldstable_head_th = document.createElement("th");
-    outputfieldstable_head_tr.appendChild(outputfieldstable_head_th);
-    outputfieldstable_head_th.innerHTML = "Optional: ";
-    outputfieldstable_head_th.setAttribute("class", "table-eventparam-heading form-heading");
-    var outputfieldstable_body = document.createElement("tbody");
-    outputfieldstable.appendChild(outputfieldstable_body);
-    // Add the outputfields
-    if (task && task.outputFields && task.outputFields.entry) {
-        for (var p = 0; p < task.outputFields.entry.length; p++) {
-            var outputfieldEntry = task.outputFields.entry[p];
-            var contextSchema = outputfieldEntry.value.fieldSchemaKey;
-            contextSchema["displaytext"] = contextSchema.name + ":" + contextSchema.version;
-            editTaskForm_addTaskOutputField(outputfieldstable_body, (createEditOrView == "VIEW"), outputfieldEntry.key,
-                    outputfieldEntry.value.optional, contextSchema, contextSchemas);
-        }
-    }
-    // add the New Output Field button
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var outputfieldTR = document.createElement("tr");
-        outputfieldTR.setAttribute("class", "field-taskoutputfield-tr.new");
-        outputfieldstable_body.appendChild(outputfieldTR);
-        var outputfieldTD = document.createElement("td");
-        outputfieldTD.setAttribute("colspan", "3");
-        outputfieldTR.appendChild(outputfieldTD);
-        var addOutputFieldInput = createAddFormButton();
-        outputfieldTD.appendChild(addOutputFieldInput);
-        addOutputFieldInput.onclick = function() {
-            editTaskForm_addTaskOutputField(outputfieldstable_body, false, null, false, null, contextSchemas);
-        };
-    }
-
-    // tasklogic
-    var tasklogicLI = document.createElement("li");
-    formul.appendChild(tasklogicLI);
-    var tasklogicLabel = document.createElement("label");
-    tasklogicLI.appendChild(tasklogicLabel);
-    tasklogicLabel.setAttribute("for", "editTaskFormTaskLogicTextArea");
-    tasklogicLabel.innerHTML = "Task Logic: ";
-    var tlogic = null;
-    if (task && task.taskLogic && task.taskLogic.logic) {
-        tlogic = task.taskLogic.logic;
-    }
-    // showHideTextarea(id_prefix, content, initialshow, editable, disabled)
-    var textarea = showHideTextarea("editTaskFormTaskLogicTextArea", tlogic, false, !edit_disabled, false);
-
-    tasklogicLI.appendChild(textarea);
-
-    // tasklogic type
-    var taskLogicTypeLI = document.createElement("li");
-    formul.appendChild(taskLogicTypeLI);
-    var taskLogicTypeLabel = document.createElement("label");
-    taskLogicTypeLI.appendChild(taskLogicTypeLabel);
-    taskLogicTypeLabel.setAttribute("for", "editTaskFormTaskLogicTypeInput");
-    taskLogicTypeLabel.innerHTML = "Task Logic Type / Flavour: ";
-    var taskLogicTypeInput = document.createElement("input");
-    taskLogicTypeLI.appendChild(taskLogicTypeInput);
-    taskLogicTypeInput.setAttribute("id", "editTaskFormTaskLogicTypeInput");
-    taskLogicTypeInput.setAttribute("type", "text");
-    taskLogicTypeInput.setAttribute("name", "editTaskFormTaskLogicTypeInput");
-    taskLogicTypeInput.setAttribute("class", "field-taskLogicType ebInput");
-    taskLogicTypeInput.setAttribute("placeholder", "MVEL");
-    if (task && task.taskLogic && task.taskLogic.logicFlavour) {
-        taskLogicTypeInput.value = task.taskLogic.logicFlavour;
-    }
-    if (createEditOrView != "CREATE" && createEditOrView != "EDIT") {
-        taskLogicTypeInput.readOnly = true;
-    }
-
-    // parameters
-    var paramsLI = document.createElement("li");
-    formul.appendChild(paramsLI);
-    var paramsLabel = document.createElement("label");
-    paramsLI.appendChild(paramsLabel);
-    paramsLabel.setAttribute("for", "editTaskFormParamsTable");
-    paramsLabel.innerHTML = "Task Parameters: ";
-    var paramstable = document.createElement("table");
-    paramstable.setAttribute("id", "editTaskFormParamsTable");
-    paramstable.setAttribute("name", "editTaskFormParamsTable");
-    paramstable.setAttribute("class", "table-taskparam");
-    paramsLI.appendChild(paramstable);
-    var paramstable_head = document.createElement("thead");
-    paramstable.appendChild(paramstable_head);
-    var paramstable_head_tr = document.createElement("tr");
-    paramstable_head.appendChild(paramstable_head_tr);
-    paramstable_head_tr.appendChild(document.createElement("th")); // empty,
-                                                                    // for
-                                                                    // delete
-                                                                    // button
-    var paramstable_head_th = document.createElement("th");
-    paramstable_head_tr.appendChild(paramstable_head_th);
-    paramstable_head_th.innerHTML = "Task Parameter Name: ";
-    paramstable_head_th.setAttribute("class", "table-taskparam-heading form-heading");
-    paramstable_head_th = document.createElement("th");
-    paramstable_head_tr.appendChild(paramstable_head_th);
-    paramstable_head_th.innerHTML = "Task Parameter Value: ";
-    paramstable_head_th.setAttribute("class", "table-taskparam-heading form-heading");
-    var paramstable_body = document.createElement("tbody");
-    paramstable.appendChild(paramstable_body);
-    // Add the params
-    if (task && task.taskParameters && task.taskParameters.entry) {
-        for (var p = 0; p < task.taskParameters.entry.length; p++) {
-            var paramEntry = task.taskParameters.entry[p];
-            var paramName = paramEntry.key;
-            var paramValue = paramEntry.value.defaultValue;
-            editTaskForm_addTaskParameter(paramstable_body, (createEditOrView == "VIEW"), paramName, paramValue);
-        }
-    }
-    // add the Task Parameter button
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var paramTR = document.createElement("tr");
-        paramTR.setAttribute("class", "field-taskparam-tr.new");
-        paramstable_body.appendChild(paramTR);
-        var paramTD = document.createElement("td");
-        paramTD.setAttribute("colspan", "3");
-        paramTR.appendChild(paramTD);
-        var addParamInput = createAddFormButton();
-        paramTD.appendChild(addParamInput);
-        addParamInput.onclick = function() {
-            editTaskForm_addTaskParameter(paramstable_body, false, null, null);
-        };
-    }
-
-    // Context Albums references
-    var contextsLI = document.createElement("li");
-    formul.appendChild(contextsLI);
-    var contextsLabel = document.createElement("label");
-    contextsLI.appendChild(contextsLabel);
-    contextsLabel.setAttribute("for", "editTaskFormContextsTable");
-    contextsLabel.innerHTML = "Context Albums used in Task Logic: ";
-    var contextstable = document.createElement("table");
-    contextstable.setAttribute("id", "editTaskFormContextsTable");
-    contextstable.setAttribute("name", "editTaskFormContextsTable");
-    contextstable.setAttribute("class", "table-taskcontext");
-    contextsLI.appendChild(contextstable);
-    var contextstable_head = document.createElement("thead");
-    contextstable.appendChild(contextstable_head);
-    var contextstable_head_tr = document.createElement("tr");
-    contextstable_head.appendChild(contextstable_head_tr);
-    contextstable_head_tr.appendChild(document.createElement("th")); // empty,
-                                                                        // for
-                                                                        // delete
-                                                                        // button
-    var contextstable_head_th = document.createElement("th");
-    contextstable_head_tr.appendChild(contextstable_head_th);
-    contextstable_head_th.innerHTML = "Context Album: ";
-    contextstable_head_th.setAttribute("class", "table-taskcontext-heading form-heading");
-    var contextstable_body = document.createElement("tbody");
-    contextstable.appendChild(contextstable_body);
-    // Add the contexts
-    if (task && task.contextAlbumReference && $.isArray(task.contextAlbumReference)) {
-        for (var p = 0; p < task.contextAlbumReference.length; p++) {
-            var contextEntry = task.contextAlbumReference[p];
-            var contextName = contextEntry.name + ":" + contextEntry.version;
-            var ce = {
-                "name" : contextEntry.name,
-                "version" : contextEntry.version,
-                "displaytext" : contextName
-            };
-            editTaskForm_addTaskContext(contextstable_body, (createEditOrView == "VIEW"), contextName, ce,
-                    contextAlbums);
-        }
-    }
-    // add the Task Context button
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var contextTR = document.createElement("tr");
-        contextTR.setAttribute("class", "field-taskcontext-tr.new");
-        contextstable_body.appendChild(contextTR);
-        var contextTD = document.createElement("td");
-        contextTD.setAttribute("colspan", "2");
-        contextTR.appendChild(contextTD);
-        var addContextInput = createAddFormButton();
-        contextTD.appendChild(addContextInput);
-        addContextInput.onclick = function() {
-            editTaskForm_addTaskContext(contextstable_body, false, null, null, contextAlbums);
-        };
-    }
-
-    // buttons
-    var inputLI = document.createElement("li");
-    formul.appendChild(inputLI);
-    if (createEditOrView == "CREATE") {
-        var generateUUIDInput = document.createElement("button");
-        inputLI.appendChild(generateUUIDInput);
-        generateUUIDInput.setAttribute("id", "generateUUID");
-        generateUUIDInput.setAttribute("class", "ebBtn ebBtn_large");
-        generateUUIDInput.setAttribute("type", "submit");
-        generateUUIDInput.setAttribute("value", "Generate UUID");
-        generateUUIDInput.onclick = editTaskForm_generateUUIDPressed;
-        generateUUIDInput.innerHTML = generateUUIDInput.getAttribute("value");
-        var inputSpan0 = document.createElement("span");
-        inputLI.appendChild(inputSpan0);
-        inputSpan0.setAttribute("class", "required");
-        inputSpan0.innerHTML = " ";
-
-        var generateDescriptionInput = document.createElement("button");
-        inputLI.appendChild(generateDescriptionInput);
-        generateDescriptionInput.setAttribute("id", "generateDescription");
-        generateDescriptionInput.setAttribute("class", "ebBtn ebBtn_large");
-        generateDescriptionInput.setAttribute("type", "submit");
-        generateDescriptionInput.setAttribute("value", "Generate Description");
-        generateDescriptionInput.onclick = editTaskForm_generateDescriptionPressed;
-        generateDescriptionInput.innerHTML = generateDescriptionInput.getAttribute("value");
-        var inputSpan1 = document.createElement("span");
-        inputLI.appendChild(inputSpan1);
-        inputSpan1.setAttribute("class", "required");
-        inputSpan1.innerHTML = " ";
-    }
-
-    var cancelInput = document.createElement("button");
-    inputLI.appendChild(cancelInput);
-    cancelInput.setAttribute("id", "cancel");
-    cancelInput.setAttribute("class", "ebBtn ebBtn_large");
-    cancelInput.setAttribute("type", "submit");
-    cancelInput.setAttribute("value", "Cancel");
-    cancelInput.onclick = editTaskForm_cancelPressed;
-    cancelInput.innerHTML = cancelInput.getAttribute("value");
-
-    if (createEditOrView == "CREATE" || createEditOrView == "EDIT") {
-        var inputSpan2 = document.createElement("span");
-        inputLI.appendChild(inputSpan2);
-        inputSpan2.setAttribute("class", "required");
-        inputSpan2.innerHTML = " ";
-        var submitInput = document.createElement("button");
-        inputLI.appendChild(submitInput);
-        submitInput.setAttribute("id", "submit");
-        submitInput.setAttribute("class", "ebBtn ebBtn_large");
-        submitInput.setAttribute("type", "submit");
-        submitInput.setAttribute("value", "Submit");
-        submitInput.onclick = editTaskForm_submitPressed;
-        submitInput.innerHTML = submitInput.getAttribute("value");
-    }
-
-    formParent.appendChild(contentelement);
-    scrollToTop();
-}
-
-function editTaskForm_addTaskInputField(parentTBody, disabled, name, optional, contextSchema, contextSchemas) {
-    var random_suffix = formUtils_generateUUID();
-
-    var inputfieldTR = parentTBody.insertRow(parentTBody.rows.length - 1);
-    inputfieldTR.setAttribute("inputfield_id", random_suffix);
-    inputfieldTR.setAttribute("class", "field-taskinputfield-tr");
-    if (name == null && contextSchema == null && !disabled) {
-        inputfieldTR.setAttribute("class", "field-taskinputfield-tr.new field-add-new");
-        $(inputfieldTR).show("fast");
-    }
-
-    var deleteTD = document.createElement("td");
-    inputfieldTR.appendChild(deleteTD);
-    var deleteDiv = document.createElement("div");
-    deleteTD.appendChild(deleteDiv);
-    if (!disabled) {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete");
-        deleteDiv.onclick = function(event) {
-            $(inputfieldTR).hide("fast", function() {
-                inputfieldTR.parentNode.removeChild(inputfieldTR);
-            });
-        }
-    } else {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete ebIcon_disabled");
-    }
-    var nameTD = document.createElement("td");
-    inputfieldTR.appendChild(nameTD);
-    var nameInput = document.createElement("input");
-    nameTD.appendChild(nameInput);
-    nameInput.setAttribute("id", "editTaskFormInputFieldName" + "_" + random_suffix);
-    nameInput.setAttribute("type", "text");
-    nameInput.setAttribute("name", "editTaskFormInputFieldName" + "_" + random_suffix);
-    nameInput.setAttribute("class", "field-taskinputfield-name ebInput ebInput_width_xLong");
-    if (name == null && contextSchema == null && !disabled) {
-        nameInput.setAttribute("class", "field-taskinputfield-name.new ebInput ebInput_width_xLong");
-    }
-    nameInput.setAttribute("placeholder", "Input Field Name");
-    if (name) {
-        nameInput.value = name;
-    }
-    nameInput.readOnly = disabled;
-
-    var contextSchemaTD = document.createElement("td");
-    inputfieldTR.appendChild(contextSchemaTD);
-
-    var selectDiv = dropdownList("editTaskFormInputFieldContextSchema" + "_" + random_suffix, contextSchemas,
-            contextSchema, disabled, null)
-    contextSchemaTD.appendChild(selectDiv);
-
-    var inputOptionalTD = document.createElement("td");
-    inputOptionalTD.setAttribute("class", "field-checkbox-center");
-    inputfieldTR.appendChild(inputOptionalTD);
-    var inputOptional = document.createElement("input");
-    inputOptional.setAttribute("type", "checkbox");
-    inputOptional.setAttribute("id", "editTaskFormInputFieldOptional" + "_" + random_suffix);
-    inputOptional.setAttribute("name", "editTaskFormInputFieldOptional" + "_" + random_suffix);
-    inputOptional.setAttribute("class", "field-eventparam-optional");
-    if (name == null && contextSchema == null && !disabled) {
-        inputOptional.setAttribute("class", "field-eventparam-optional.new");
-    }
-    if (optional == true) {
-        inputOptional.checked = true;
-    } else {
-        inputOptional.checked = false;
-    }
-    inputOptional.disabled = disabled;
-    inputOptionalTD.appendChild(inputOptional);
-}
-
-function editTaskForm_addTaskOutputField(parentTBody, disabled, name, optional, contextSchema, contextSchemas) {
-    var random_suffix = formUtils_generateUUID();
-
-    var outputfieldTR = parentTBody.insertRow(parentTBody.rows.length - 1);
-    outputfieldTR.setAttribute("outputfield_id", random_suffix);
-    outputfieldTR.setAttribute("class", "field-taskoutputfield-tr");
-    if (name == null && contextSchema == null && !disabled) {
-        outputfieldTR.setAttribute("class", "field-taskoutputfield-tr.new field-add-new");
-        $(outputfieldTR).show("fast");
-    }
-
-    var deleteTD = document.createElement("td");
-    outputfieldTR.appendChild(deleteTD);
-    var deleteDiv = document.createElement("div");
-    deleteTD.appendChild(deleteDiv);
-    if (!disabled) {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete");
-        deleteDiv.onclick = function(event) {
-            $(outputfieldTR).hide("fast", function() {
-                outputfieldTR.parentNode.removeChild(outputfieldTR);
-            });
-        }
-    } else {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete ebIcon ebIcon_disabled");
-    }
-    var nameTD = document.createElement("td");
-    outputfieldTR.appendChild(nameTD);
-    var nameInput = document.createElement("input");
-    nameTD.appendChild(nameInput);
-    nameInput.setAttribute("id", "editTaskFormOutputFieldName" + "_" + random_suffix);
-    nameInput.setAttribute("type", "text");
-    nameInput.setAttribute("name", "editTaskFormOutputFieldName" + "_" + random_suffix);
-    nameInput.setAttribute("class", "field-taskoutputfield-name ebInput ebInput_width_xLong");
-    if (name == null && contextSchema == null && !disabled) {
-        nameInput.setAttribute("class", "field-taskoutputfield-name.new ebInput ebInput_width_xLong");
-    }
-    nameInput.setAttribute("placeholder", "Output Field Name");
-    if (name) {
-        nameInput.value = name;
-    }
-    nameInput.readOnly = disabled;
-
-    var contextSchemaTD = document.createElement("td");
-    outputfieldTR.appendChild(contextSchemaTD);
-
-    var selectDiv = dropdownList("editTaskFormOutputFieldContextSchema" + "_" + random_suffix, contextSchemas,
-            contextSchema, disabled, null)
-    contextSchemaTD.appendChild(selectDiv);
-
-    var outputOptionalTD = document.createElement("td");
-    outputOptionalTD.setAttribute("class", "field-checkbox-center");
-    outputfieldTR.appendChild(outputOptionalTD);
-    var outputOptional = document.createElement("input");
-    outputOptional.setAttribute("type", "checkbox");
-    outputOptional.setAttribute("id", "editTaskFormOutputFieldOptional" + "_" + random_suffix);
-    outputOptional.setAttribute("name", "editTaskFormOutputFieldOptional" + "_" + random_suffix);
-    outputOptional.setAttribute("class", "field-eventparam-optional");
-    if (name == null && contextSchema == null && !disabled) {
-        outputOptional.setAttribute("class", "field-eventparam-optional.new");
-    }
-    if (optional == true) {
-        outputOptional.checked = true;
-    } else {
-        outputOptional.checked = false;
-    }
-    outputOptional.disabled = disabled;
-    outputOptionalTD.appendChild(outputOptional);
-}
-
-function editTaskForm_addTaskParameter(parentTBody, disabled, name, value) {
-    var random_suffix = formUtils_generateUUID();
-
-    var paramTR = parentTBody.insertRow(parentTBody.rows.length - 1);
-    paramTR.setAttribute("param_id", random_suffix);
-    paramTR.setAttribute("class", "field-taskparam-tr");
-    if (name == null && value == null && !disabled) {
-        paramTR.setAttribute("class", "field-taskparam-tr.new field-add-new");
-        $(paramTR).show("fast");
-    }
-
-    var deleteTD = document.createElement("td");
-    paramTR.appendChild(deleteTD);
-    var deleteDiv = document.createElement("div");
-    deleteTD.appendChild(deleteDiv);
-    if (!disabled) {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete");
-        deleteDiv.onclick = function(event) {
-            $(paramTR).hide("fast", function() {
-                paramTR.parentNode.removeChild(paramTR);
-            });
-        }
-    } else {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete ebIcon_disabled");
-    }
-    var nameTD = document.createElement("td");
-    paramTR.appendChild(nameTD);
-    var nameInput = document.createElement("input");
-    nameTD.appendChild(nameInput);
-    nameInput.setAttribute("id", "editTaskFormParamName" + "_" + random_suffix);
-    nameInput.setAttribute("type", "text");
-    nameInput.setAttribute("name", "editTaskFormParamName" + "_" + random_suffix);
-    nameInput.setAttribute("class", "field-taskparam-name ebInput ebInput_width_xLong");
-    if (name == null && value == null && !disabled) {
-        nameInput.setAttribute("class", "field-taskparam-name.new ebInput ebInput_width_xLong");
-    }
-    nameInput.setAttribute("placeholder", "Task Parameter Name");
-    if (name) {
-        nameInput.value = name;
-    }
-    nameInput.readOnly = disabled;
-
-    var valueTD = document.createElement("td");
-    paramTR.appendChild(valueTD);
-    var paramInput = document.createElement("input");
-    valueTD.appendChild(paramInput);
-    paramInput.setAttribute("id", "editTaskFormParamValue" + "_" + random_suffix);
-    paramInput.setAttribute("type", "text");
-    paramInput.setAttribute("name", "editTaskFormParamValue" + "_" + random_suffix);
-    paramInput.setAttribute("class", "field-taskparam-value  ebInput ebInput_width_xLong");
-    if (name == null && value == null && !disabled) {
-        paramInput.setAttribute("class", "field-taskparam-value.new ebInput ebInput_width_xLong");
-    }
-    paramInput.setAttribute("placeholder", "Task Parameter Value");
-    if (value) {
-        paramInput.value = value;
-    }
-    paramInput.readOnly = disabled;
-}
-
-function editTaskForm_addTaskContext(parentTBody, disabled, name, albumreference, contextAlbums) {
-    var random_suffix = formUtils_generateUUID();
-
-    var contextTR = parentTBody.insertRow(parentTBody.rows.length - 1);
-    contextTR.setAttribute("context_id", random_suffix);
-    contextTR.setAttribute("class", "field-taskcontext-tr");
-    if (name == null && albumreference == null && !disabled) {
-        contextTR.setAttribute("class", "field-taskcontext-tr.new field-add-new");
-        $(contextTR).show("fast");
-    }
-
-    var deleteTD = document.createElement("td");
-    contextTR.appendChild(deleteTD);
-    var deleteDiv = document.createElement("div");
-    deleteTD.appendChild(deleteDiv);
-    if (!disabled) {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete");
-        deleteDiv.onclick = function(event) {
-            $(contextTR).hide("fast", function() {
-                contextTR.parentNode.removeChild(contextTR);
-            });
-        }
-    } else {
-        deleteDiv.setAttribute("class", "ebIcon ebIcon_interactive ebIcon_delete ebIcon_disabled");
-    }
-    var valueTD = document.createElement("td");
-    contextTR.appendChild(valueTD);
-
-    var selectDiv = dropdownList("editTaskFormContextValue" + "_" + random_suffix, contextAlbums, albumreference,
-            disabled, null);
-    valueTD.appendChild(selectDiv);
-}
-
-function editTaskForm_generateUUIDPressed() {
-    document.getElementById("editTaskFormUuidInput").value = formUtils_generateUUID();
-}
-
-function editTaskForm_generateDescriptionPressed() {
-    document.getElementById("editTaskFormDescriptionTextArea").value = formUtils_generateDescription(document
-            .getElementById("editTaskFormNameInput").value, document.getElementById("editTaskFormVersionInput").value,
-            document.getElementById("editTaskFormUuidInput").value);
-}
-
-function editTaskForm_cancelPressed() {
-    apexUtils_removeElement("editTaskFormDiv");
-    taskTab_reset();
-}
-
-function editTaskForm_submitPressed() {
-    var createEditOrView = document.getElementById("editTaskForm").getAttribute("createEditOrView");
-    if (!createEditOrView || createEditOrView == "" || (createEditOrView != "CREATE" && createEditOrView != "EDIT")) {
-        console.error("Invalid operation \"" + createEditOrView
-                + "\" passed to editTaskForm_submitPressed function. Edit failed");
-        apexUtils_removeElement("editTaskFormDiv");
-        taskTab_reset();
-        return;
-    }
-
-    var name = document.getElementById('editTaskFormNameInput').value;
-    var version = document.getElementById('editTaskFormVersionInput').value;
-
-    // get the task inputfields
-    var taskbean_inputfields = null;
-    var inputfieldstablerows = document.getElementById("editTaskFormInputFieldsTable").rows;
-    if (inputfieldstablerows && inputfieldstablerows.length > 2) {
-        taskbean_inputfields = new Object();
-        for (var i = 1; i < inputfieldstablerows.length - 1; i++) {
-            var inputfieldTR = inputfieldstablerows[i];
-            if (inputfieldTR && inputfieldTR.getAttribute("inputfield_id")) {
-                var inputfield_id = inputfieldTR.getAttribute("inputfield_id");
-                var inputfieldname = document.getElementById("editTaskFormInputFieldName" + "_" + inputfield_id).value;
-                var inputfield_optional = document.getElementById("editTaskFormInputFieldOptional" + "_"
-                        + inputfield_id).checked;
-                var inputfield_dt = document.getElementById("editTaskFormInputFieldContextSchema" + "_" + inputfield_id
-                        + "_dropdownList").selectedOption;
-                if (taskbean_inputfields[inputfieldname]) {
-                    alert("Task \"" + name + "\" contains more than one Input Field called \"" + inputfieldname + "\"");
-                    return false;
-                }
-                if (inputfield_dt == null) {
-                    alert("Task \"" + name + "\" has no selected Context Item Schema for the Input Field called \""
-                            + inputfieldname + "\"");
-                    return false;
-                }
-                var inputfield_dt_name = inputfield_dt.name;
-                var inputfield_dt_version = inputfield_dt.version;
-                taskbean_inputfields[inputfieldname] = {
-                    "localName" : inputfieldname,
-                    "name" : inputfield_dt_name,
-                    "version" : inputfield_dt_version,
-                    "optional" : inputfield_optional
-                };
-            }
-        }
-    }
-    // get the task outputfields
-    var taskbean_outputfields = null;
-    var outputfieldstablerows = document.getElementById("editTaskFormOutputFieldsTable").rows;
-    if (outputfieldstablerows && outputfieldstablerows.length > 2) {
-        taskbean_outputfields = new Object();
-        for (var i = 1; i < outputfieldstablerows.length - 1; i++) {
-            var outputfieldTR = outputfieldstablerows[i];
-            if (outputfieldTR && outputfieldTR.getAttribute("outputfield_id")) {
-                var outputfield_id = outputfieldTR.getAttribute("outputfield_id");
-                var outputfieldname = document.getElementById("editTaskFormOutputFieldName" + "_" + outputfield_id).value;
-                var outputfield_optional = document.getElementById("editTaskFormOutputFieldOptional" + "_"
-                        + outputfield_id).checked;
-                var outputfield_dt = document.getElementById("editTaskFormOutputFieldContextSchema" + "_"
-                        + outputfield_id + "_dropdownList").selectedOption;
-                if (taskbean_outputfields[outputfieldname]) {
-                    alert("Task \"" + name + "\" contains more than one Output Field called \"" + outputfieldname
-                            + "\"");
-                    return false;
-                }
-                if (outputfield_dt == null) {
-                    alert("Task \"" + name + "\" has no selected Context Item Schema for the Output Field called \""
-                            + outputfieldname + "\"");
-                    return false;
-                }
-                var outputfield_dt_name = outputfield_dt.name;
-                var outputfield_dt_version = outputfield_dt.version;
-                taskbean_outputfields[outputfieldname] = {
-                    "localName" : outputfieldname,
-                    "name" : outputfield_dt_name,
-                    "version" : outputfield_dt_version,
-                    "optional" : outputfield_optional
-                };
-            }
-        }
-    }
-    // get the logic fields
-    var logicfield = document.getElementById("editTaskFormTaskLogicTextArea_textarea").value;
-    var logictype = document.getElementById("editTaskFormTaskLogicTypeInput").value;
-    if (logictype == null || logictype == "") {
-        alert("Task \"" + name + "\" has no Task Logic Type");
-        return false;
-    }
-    var tasklogic = {
-        "logic" : logicfield,
-        "logicFlavour" : logictype
-    };
-    // get the task parameters
-    var taskbean_parameters = null;
-    var paramstablerows = document.getElementById("editTaskFormParamsTable").rows;
-    if (paramstablerows && paramstablerows.length > 2) {
-        taskbean_parameters = new Object();
-        for (var i = 1; i < paramstablerows.length - 1; i++) {
-            var paramTR = paramstablerows[i];
-            if (paramTR && paramTR.getAttribute("param_id")) {
-                var param_id = paramTR.getAttribute("param_id");
-                var paramname = document.getElementById("editTaskFormParamName" + "_" + param_id).value;
-                var paramvalue = document.getElementById("editTaskFormParamValue" + "_" + param_id).value;
-                if (taskbean_parameters[paramname]) {
-                    alert("Task \"" + name + "\" contains more than one Task Parameters called \"" + paramname + "\"");
-                    return false;
-                }
-                taskbean_parameters[paramname] = {
-                    "parameterName" : paramname,
-                    "defaultValue" : paramvalue
-                };
-            }
-        }
-    }
-    // get the context album references
-    var taskbean_context = null;
-    var contextstablerows = document.getElementById("editTaskFormContextsTable").rows;
-    if (contextstablerows && contextstablerows.length > 2) {
-        taskbean_context = new Array();
-        for (var i = 1; i < contextstablerows.length - 1; i++) {
-            var contextTR = contextstablerows[i];
-            if (contextTR && contextTR.getAttribute("context_id")) {
-                var context_id = contextTR.getAttribute("context_id");
-                var contextalbumvalue = document.getElementById("editTaskFormContextValue" + "_" + context_id
-                        + "_dropdownList").selectedOption;
-                if (contextalbumvalue == null) {
-                    alert("Task \"" + name + "\" has Context Album reference, but no Context Album is selected");
-                    return false;
-                }
-                var contextalbumname = contextalbumvalue.displaytext;
-                for (var j = 0; j < taskbean_context.length; j++) {
-                    if (taskbean_context[j] != null && taskbean_context[j].name == contextalbumvalue.name
-                            && taskbean_context[j].version == contextalbumvalue.version) {
-                        alert("Task \"" + name + "\" references Context Album \"" + contextalbumname
-                                + "\" more than once");
-                        return false;
-                    }
-                }
-                taskbean_context.push({
-                    "name" : contextalbumvalue.name,
-                    "version" : contextalbumvalue.version
-                });
-            }
-        }
-    }
-
-    // generate an task bean to json-ify and send in rest request
-    var taskbean = {
-        "name" : name,
-        "version" : version,
-        "uuid" : document.getElementById('editTaskFormUuidInput').value,
-        "description" : document.getElementById('editTaskFormDescriptionTextArea').value,
-        "taskLogic" : tasklogic,
-        "inputFields" : taskbean_inputfields,
-        "outputFields" : taskbean_outputfields,
-        "parameters" : taskbean_parameters,
-        "contexts" : taskbean_context
-    }
-    var jsonString = JSON.stringify(taskbean);
-
-    if (createEditOrView == "CREATE") {
-        var requestURL = restRootURL + "/Task/Create";
-        ajax_post(requestURL, jsonString, function(resultData) {
-            apexUtils_removeElement("editTaskFormDiv");
-            taskTab_reset();
-            keyInformationTab_reset()
-        });
-    } else if (createEditOrView == "EDIT") {
-        var requestURL = restRootURL + "/Task/Update";
-        ajax_put(requestURL, jsonString, function(resultData) {
-            apexUtils_removeElement("editTaskFormDiv");
-            taskTab_reset();
-            keyInformationTab_reset()
-        });
-    }
-
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexTaskTab.js b/client/client-editor/src/main/resources/webapp/js/ApexTaskTab.js
deleted file mode 100644
index 5671cca86..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexTaskTab.js
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function taskTab_reset() {
-    taskTab_deactivate();
-    taskTab_activate();
-}
-
-function taskTab_activate() {
-    taskTab_create();
-    
-    var requestURL = restRootURL + "/Task/Get?name=&version=";
-
-    ajax_get(requestURL, function(data) {
-        $("#taskTableBody").find("tr:gt(0)").remove();
-        
-        for (var i = 0; i < data.messages.message.length; i++) {
-            var task = JSON.parse(data.messages.message[i]).apexTask;
-            
-            var taskRow_tr = document.createElement("tr");
-            var taskid = task.key.name + ":"  + task.key.version;
-
-            var taskTableRow = 
-                "<td>"                              +
-                task.key.name + ":"  + task.key.version +
-                "</td>"                                 +
-                "<td>"                                  +
-                task.taskLogic.logicFlavour             +
-                "</td>";
-
-            taskTableRow += "<td><table class='ebTable'><thead><tr class='headerRow'><th>Field Name</th><th>Field Type/Schema</th><th>Optional</th></tr></thead><tbody>";
-            for (var f = 0; f < task.inputFields.entry.length; f++) {
-                var fieldEntry = task.inputFields.entry[f];
-
-                taskTableRow +=
-                    "<tr><td>"                        +
-                    fieldEntry.key                    +
-                    "</td>"                           +
-                    "<td>"                            +
-                    fieldEntry.value.fieldSchemaKey.name + ":"  + fieldEntry.value.fieldSchemaKey.version +
-                    "<td>"                            +
-                    fieldEntry.value.optional           +
-                    "</td></tr>";
-            }
-            taskTableRow += "</tbody></table></td>";
-            
-            taskTableRow += "<td><table class='ebTable'><thead><tr class='headerRow'><th>Field Name</th><th>Field Type/Schema</th><th>Optional</th></tr></thead><tbody>";
-            for (var f = 0; f < task.outputFields.entry.length; f++) {
-                var fieldEntry = task.outputFields.entry[f];
-
-                taskTableRow +=
-                    "<tr><td>"                        +
-                    fieldEntry.key                    +
-                    "</td>"                           +
-                    "<td>"                            +
-                    fieldEntry.value.fieldSchemaKey.name + ":"  + fieldEntry.value.fieldSchemaKey.version +
-                    "<td>"                            +
-                    fieldEntry.value.optional           +
-                    "</td></tr>";
-            }
-            taskTableRow += "</tbody></table></td>";
-
-            taskTableRow += "<td><table class='ebTable'><thead><tr class='headerRow'><th>Parameter Name</th><th>Default Value</th></tr></thead><tbody>";
-            for (var p = 0; p < task.taskParameters.entry.length; p++) {
-                var parameterEntry = task.taskParameters.entry[p];
-
-                taskTableRow +=
-                    "<tr><td>"                        +
-                    parameterEntry.key                +
-                    "</td>"                           +
-                    "<td>"                            +
-                    parameterEntry.value.defaultValue +
-                    "</td>";
-            }
-            taskTableRow += "</tbody></table></td>";
-            
-            taskTableRow += "<td><table class='ebTable'><tbody>";
-            for (var c = 0; c < task.contextAlbumReference.length; c++) {
-                var contextAlbumReference = task.contextAlbumReference[c];
-
-                taskTableRow +=
-                    "<tr><td>"                            +
-                    contextAlbumReference.name + ":" + contextAlbumReference.version  +
-                    "</td></tr>";
-            }
-            taskTableRow += "</tbody></table></td>";
-
-            taskRow_tr.innerHTML = taskTableRow; 
-            taskRow_tr.addEventListener('contextmenu', rightClickMenu_scopePreserver("taskTabContent", "Task", task.key.name, task.key.version));  
-
-            $("#taskTableBody").append(taskRow_tr);
-
-        }
-    });
-}
-
-function taskTab_deactivate() {
-    apexUtils_removeElement("taskTabContent");
-}
-
-function taskTab_create() {
-    var taskTab = document.getElementById("tasksTab");
-
-    var taskTabContent = document.getElementById("taskTabContent");
-    if (taskTabContent != null) {
-        return
-    }
-
-    var taskTabContent = document.createElement("taskTabContent");
-    taskTab.appendChild(taskTabContent);
-    taskTabContent.setAttribute("id", "taskTabContent");
-    taskTabContent.addEventListener('contextmenu', rightClickMenu_scopePreserver("taskTabContent", "Task", null, null));  
-
-    var taskTable = createTable("taskTable");
-    taskTabContent.appendChild(taskTable);
-
-    var taskTableHeader = document.createElement("thead");
-    taskTable.appendChild(taskTableHeader);
-    taskTableHeader.setAttribute("id", "taskTableHeader");
-
-    var taskTableHeaderRow = document.createElement("tr");
-    taskTableHeader.appendChild(taskTableHeaderRow);
-    taskTableHeaderRow.setAttribute("id", "taskTableHeaderRow");
-
-    var taskTableKeyHeader = document.createElement("th");
-    taskTableHeaderRow.appendChild(taskTableKeyHeader);
-    taskTableKeyHeader.setAttribute("id", "taskTableKeyHeader");
-    taskTableKeyHeader.appendChild(document.createTextNode("Task"));
-
-    var taskTableLogicFlavourHeader = document.createElement("th");
-    taskTableHeaderRow.appendChild(taskTableLogicFlavourHeader);
-    taskTableLogicFlavourHeader.setAttribute("id", "taskTableLogicFlavourHeader");
-    taskTableLogicFlavourHeader.appendChild(document.createTextNode("Logic Flavour"));
-
-    var taskTableInputFieldHeader = document.createElement("th");
-    taskTableHeaderRow.appendChild(taskTableInputFieldHeader);
-    taskTableInputFieldHeader.setAttribute("id", "taskTableInputFieldHeader");
-    taskTableInputFieldHeader.appendChild(document.createTextNode("Input Fields"));
-
-    var taskTableOutputFieldHeader = document.createElement("th");
-    taskTableHeaderRow.appendChild(taskTableOutputFieldHeader);
-    taskTableOutputFieldHeader.setAttribute("id", "taskTableOutputFieldHeader");
-    taskTableOutputFieldHeader.appendChild(document.createTextNode("Output Fields"));
-
-    var taskTableParameterHeader = document.createElement("th");
-    taskTableHeaderRow.appendChild(taskTableParameterHeader);
-    taskTableParameterHeader.setAttribute("id", "taskTableParameterHeader");
-    taskTableParameterHeader.appendChild(document.createTextNode("Parameters"));
-
-    var taskTableContextReferenceHeader = document.createElement("th");
-    taskTableHeaderRow.appendChild(taskTableContextReferenceHeader);
-    taskTableContextReferenceHeader.setAttribute("id", "taskTableContextReferenceHeader");
-    taskTableContextReferenceHeader.appendChild(document.createTextNode("Context Album References"));
-
-    var taskTableBody = document.createElement("tbody");
-    taskTable.appendChild(taskTableBody);
-    taskTable.setAttribute("id", "taskTableBody");
-}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/ApexUtils.js b/client/client-editor/src/main/resources/webapp/js/ApexUtils.js
deleted file mode 100644
index 71098e838..000000000
--- a/client/client-editor/src/main/resources/webapp/js/ApexUtils.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function apexUtils_areYouSure(message) {
-    return confirm(message);
-}
-
-function apexUtils_emptyElement(elementname) {
-    var element = document.getElementById(elementname);
-    if (element != null) {
-        while (element.firstChild) {
-            element.removeChild(element.firstChild);
-        }
-    }
-}
-
-function apexUtils_removeElement(elementname) {
-    var element = document.getElementById(elementname);
-    if (element != null) {
-        element.parentNode.removeChild(element);
-    }
-}
-
-var _entityMap = {
-    '&' : '&amp;',
-    '<' : '&lt;',
-    '>' : '&gt;',
-    '"' : '&quot;',
-    "'" : '&#39;',
-    '/' : '&#x2F;',
-    '`' : '&#x60;',
-    '=' : '&#x3D;',
-    '\n' : '<br>',
-    '\t' : '&nbsp;&nbsp;&nbsp;&nbsp;',
-    ' ' : '&nbsp;',
-};
-
-function apexUtils_escapeHtml(string) {
-    return String(string).replace(/[&<>"'\/\t\n ]/g, function(s) {
-        return _entityMap[s];
-    });
-}
-
-function apexUtils_deleteTableRow(tablename, tablerowindex) {
-    document.getElementById(tablename).deleteRow(tablerowindex)
-}
-
-function createAddFormButton(_text) {
-    var text = _text ? _text : "Add";
-    var element = document.createElement("div");
-    element.setAttribute("class", "add-field")
-    var addIcon = document.createElement("i");
-    addIcon.setAttribute("class", "form-add-icon ebIcon ebIcon_add");
-    var addText = document.createElement("span");
-    addText.setAttribute("class", "form-add-text");
-    addText.innerHTML = text;
-    element.appendChild(addIcon);
-    element.appendChild(addText);
-    return element;
-}
-
-function createEditArea(id, options, callback) {
-    options = options ? options : {};
-    var syntax = options.syntax ? options.syntax : "java";
-    var start_highlight = options.start_highlight ? options.start_highlight : true;
-    var min_height = options.min_height ? options.min_height : 400;
-    var font_size = options.font_size ? options.font_size : 12
-    var is_editable = options.hasOwnProperty("is_editable") ? options.is_editable : true;
-    var toolbar = options.toolbar ? options.toolbar : "select_font, |, highlight, reset_highlight";
-
-    setTimeout(function() {
-        editAreaLoader.init({
-            id : id,
-            is_editable : is_editable,
-            syntax : syntax,
-            start_highlight : start_highlight,
-            min_height : min_height,
-            font_size : font_size,
-            toolbar : toolbar,
-            change_callback : "onEditAreaChange"
-        });
-    }, 100);
-
-}
-
-function onEditAreaChange(id) {
-    $("#" + id).val(editAreaLoader.getValue(id));
-}
-
-function isFirefox() {
-    return (navigator.userAgent.indexOf("Firefox") != -1);
-}
-
-function scrollToTop(element) {
-    element = element ? element : "html, body";
-    $(element).animate({
-        scrollTop : 0
-    }, 'fast');
-}
-
-function getHomepageURL() {
-    var homepageURL = location.protocol
-            + "//"
-            + window.location.hostname
-            + (location.port ? ':' + location.port : '')
-            + (location.pathname.endsWith("/editor/") ? location.pathname.substring(0, location.pathname
-                    .indexOf("editor/")) : location.pathname);
-    location.href = homepageURL;
-}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/contextMenu.js b/client/client-editor/src/main/resources/webapp/js/contextMenu.js
deleted file mode 100644
index 1640019f8..000000000
--- a/client/client-editor/src/main/resources/webapp/js/contextMenu.js
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-//hide the context menu, if it's shown, anytime the user clicks anywhere. 
-$(document).on("click", function(event) {
-    if (document.getElementById("rightClickMenu"))
-        document.getElementById("rightClickMenu").className = "ebContextMenu-body_visible_false";
-});
-
-// Hack: need to maintain each passed parameter in a way it can be referenced by
-// the onContextMenu handler function for
-// each iteration inside a loop, after the passed parameter goes out of scope
-// and changes.
-// see
-// http://stackoverflow.com/questions/750486/javascript-closure-inside-loops-simple-practical-example
-function rightClickMenu_scopePreserver(parent, type, name, version) {
-    return function(clickevent) {
-        rightClickMenu(clickevent, parent, type, name, version);
-    }
-}
-
-// Context menu when user right-clicks inside one of the display tabs
-function rightClickMenu(event, parent, type, name, version) {
-    var rclickdiv = document.getElementById('rightClickMenu');
-    if (rclickdiv == null) {
-        rclickdiv = document.createElement("div");
-        document.body.appendChild(rclickdiv);
-    }
-    // clear the div
-    apexUtils_emptyElement('rightClickMenu');
-    rclickdiv.setAttribute("id", "rightClickMenu");
-    rclickdiv.setAttribute("title", type + " menu");
-    rclickdiv.addEventListener("contextmenu", function(e) {
-        e.preventDefault();
-    }, false);
-
-    var ul = document.createElement("div");
-    ul.setAttribute("class", "ebComponentList")
-    rclickdiv.appendChild(ul);
-
-    var li1 = document.createElement("div");
-    li1.setAttribute("class", "ebComponentList-item")
-    li1.onclick = function() {
-        return rightClickMenuCreate(parent, type);
-    };
-    li1.innerHTML = "Create new <type>" + type + "<type>";
-    if (type.toUpperCase() == "KEYINFORMATION") {
-        li1.setAttribute("class", "ebComponentList-item ebComponentList-item_disabled");
-    }
-    ul.appendChild(li1);
-
-    if (name) {
-        var value = name + ":" + version;
-
-        var li4 = document.createElement("div");
-        li4.setAttribute("class", "ebComponentList-item")
-        li4.onclick = function() {
-            return rightClickMenuView(parent, type, name, version);
-        };
-        li4.innerHTML = "View <type>" + type + "</type> <value>" + value + "<value>";
-        ul.appendChild(li4);
-
-        var li2 = document.createElement("div");
-        li2.setAttribute("class", "ebComponentList-item")
-        li2.onclick = function() {
-            return rightClickMenuEdit(parent, type, name, version);
-        };
-        li2.innerHTML = "Edit <type>" + type + "</type> <value>" + value + "<value>";
-        ul.appendChild(li2);
-
-        var li3 = document.createElement("div");
-        li3.setAttribute("class", "ebComponentList-item")
-        li3.onclick = function() {
-            return rightClickMenuDelete(parent, type, name, version);
-        };
-        li3.innerHTML = "Delete <type>" + type + "</type> <value>" + value + "<value>";
-        ul.appendChild(li3);
-        if (type.toUpperCase() == "KEYINFORMATION") {
-            li3.setAttribute("class", "ebComponentList-item ebComponentList-item_disabled");
-        }
-    }
-
-    // rclickdiv.setAttribute("class", "contextmenu_show"); ewatkmi: swapped
-    // with ebContextMenu
-    rclickdiv.setAttribute("class",
-            "ebContextMenu-body ebContextMenu-body_corner_default ebContextMenu-body_visible_true");
-    rclickdiv.style.position = "absolute";
-    rclickdiv.style.top = mouseY(event);
-    rclickdiv.style.left = mouseX(event);
-
-    // prevent event bubbling up to parent elements for their on-click
-    event.stopPropagation();
-    // prevent default context menu
-    event.returnValue = false;
-    event.preventDefault();
-    return false;
-}
-function rightClickMenuCreate(parent, type) {
-    document.getElementById("rightClickMenu").className = "ebContextMenu-body_visible_false";
-    if (type.toUpperCase() == "CONTEXTSCHEMA") {
-        editContextSchemaForm_createContextSchema(parent);
-    } else if (type.toUpperCase() == "EVENT") {
-        editEventForm_createEvent(parent);
-    } else if (type.toUpperCase() == "TASK") {
-        editTaskForm_createTask(parent);
-    } else if (type.toUpperCase() == "POLICY") {
-        editPolicyForm_createPolicy(parent);
-    } else if (type.toUpperCase() == "CONTEXTALBUM") {
-        editContextAlbumForm_createContextAlbum(parent);
-    } else {
-        alert("So you want to create a new " + type);
-    }
-}
-function rightClickMenuView(parent, type, value_name, value_version) {
-    document.getElementById("rightClickMenu").className = "ebContextMenu-body_visible_false";
-    if (type.toUpperCase() == "CONTEXTSCHEMA") {
-        editContextSchemaForm_viewContextSchema(parent, value_name, value_version);
-    } else if (type.toUpperCase() == "EVENT") {
-        editEventForm_viewEvent(parent, value_name, value_version);
-    } else if (type.toUpperCase() == "TASK") {
-        editTaskForm_viewTask(parent, value_name, value_version);
-    } else if (type.toUpperCase() == "POLICY") {
-        editPolicyForm_viewPolicy(parent, value_name, value_version);
-    } else if (type.toUpperCase() == "CONTEXTALBUM") {
-        editContextAlbumForm_viewContextAlbum(parent, value_name, value_version);
-    } else {
-        alert("So you want to view " + type + " " + value_name + ":" + value_version);
-    }
-}
-function rightClickMenuEdit(parent, type, value_name, value_version) {
-    document.getElementById("rightClickMenu").className = "ebContextMenu-body_visible_false";
-    if (type.toUpperCase() == "CONTEXTSCHEMA") {
-        editContextSchemaForm_editContextSchema(parent, value_name, value_version);
-    } else if (type.toUpperCase() == "EVENT") {
-        editEventForm_editEvent(parent, value_name, value_version);
-    } else if (type.toUpperCase() == "TASK") {
-        editTaskForm_editTask(parent, value_name, value_version);
-    } else if (type.toUpperCase() == "POLICY") {
-        editPolicyForm_editPolicy(parent, value_name, value_version);
-    } else if (type.toUpperCase() == "CONTEXTALBUM") {
-        editContextAlbumForm_editContextAlbum(parent, value_name, value_version);
-    } else {
-        alert("So you want to edit " + type + " " + value_name + ":" + value_version);
-    }
-}
-function rightClickMenuDelete(parent, type, value_name, value_version) {
-    document.getElementById("rightClickMenu").className = "ebContextMenu-body_visible_false";
-    if (type.toUpperCase() == "CONTEXTSCHEMA") {
-        editContextSchemaForm_deleteContextSchema(parent, value_name, value_version);
-    } else if (type.toUpperCase() == "EVENT") {
-        editEventForm_deleteEvent(parent, value_name, value_version);
-    } else if (type.toUpperCase() == "TASK") {
-        editTaskForm_deleteTask(parent, value_name, value_version);
-    } else if (type.toUpperCase() == "POLICY") {
-        editPolicyForm_deletePolicy(parent, value_name, value_version);
-    } else if (type.toUpperCase() == "CONTEXTALBUM") {
-        editContextAlbumForm_deleteContextAlbum(parent, value_name, value_version);
-    } else {
-        alert("So you want to delete " + type + " " + value_name + ":" + value_version);
-    }
-}
-function mouseX(evt) {
-    if (evt.pageX) {
-        return evt.pageX;
-    } else if (evt.clientX) {
-        return evt.clientX
-                + (document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft);
-    } else {
-        return null;
-    }
-}
-function mouseY(evt) {
-    if (evt.pageY) {
-        return evt.pageY;
-    } else if (evt.clientY) {
-        return evt.clientY
-                + (document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop);
-    } else {
-        return null;
-    }
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/dropdownList.js b/client/client-editor/src/main/resources/webapp/js/dropdownList.js
deleted file mode 100644
index 8f42b8a84..000000000
--- a/client/client-editor/src/main/resources/webapp/js/dropdownList.js
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function dropdownList_option_select_scopePreserver(optionDiv, selectedOption, onselect) {
-    return function(event) {
-        dropdownList_option_select(optionDiv, selectedOption, onselect);
-    }
-}
-function dropdownList_filter_scopePreserver(optionDiv, optionUl) {
-    return function(event) {
-        dropdownList_filter(optionDiv, optionUl);
-    }
-}
-function dropdownList_option_select(divname, selectedOption, onselect) {
-    document.getElementById(divname + "_display").innerHTML = selectedOption.displaytext;
-    document.getElementById(divname)["selectedOption"] = selectedOption;
-    dropdownList_display_hide(divname);
-    if (onselect) {
-        onselect(selectedOption);
-    }
-}
-function dropdownList_display_click(divname, options, selected, disabled, getoptions) {
-    if (!document.getElementById(divname + "_options").classList.contains("dropdownList_show")) {
-        if (getoptions != null) {
-            var new_options = getoptions();
-            dropdownList_ChangeOptions(document.getElementById(divname), new_options, selected, disabled, getoptions);
-        }
-        document.getElementById(divname + "_options").classList
-                .add("dropdownList_show", "dropdownList_display_clicked");
-    } else {
-        document.getElementById(divname + "_options").classList.remove("dropdownList_show",
-                "dropdownList_display_clicked");
-    }
-}
-function dropdownList_display_hide(optionDiv) {
-    document.getElementById(optionDiv + "_options").classList.remove("dropdownList_show");
-}
-function dropdownList_filter(optionDiv, optionUl) {
-    var input, filter, ul;
-    var input = document.getElementById(optionDiv + "_search");
-    var filter = input.value.toUpperCase();
-    var ul = document.getElementById(optionDiv + "_options_list_ul");
-    var lis = ul.querySelectorAll("#" + ul.id + " > li"); // get li direct
-                                                            // child elements
-    for (var i = 0; i < lis.length; i++) {
-        if (lis[i].innerHTML.toUpperCase().indexOf(filter) > -1) {
-            lis[i].style.display = "";
-        } else {
-            lis[i].style.display = "none";
-        }
-    }
-}
-
-/*
- * Create a dropdown list, with a search function.
- * 
- * Each dropdownList must have a unique "id_prefix" value as a unique identifier
- * prefix "options" is an array of objects for options, where each object has a
- * field called name. options[i].displaytext is a displayed text for the option
- * "selected" is one of the options contained in list in the "options"
- * parameter. "selected" must contain at least one field: selected.displaytext,
- * where the value of selected.displaytext should be the same as
- * options[i].displaytext for one of the values in options. "disabled" is a
- * boolean, whether the drop down is enabled or disabled "onselect" is a
- * function that is called when an option is selected, with a parameter that is
- * the selected option from the passed "options" "getoptions" is a function that
- * is called to dynamically retrieve options. It is called when the drop-down
- * list is checked. If this is set the "options" parameter is ignored.
- * 
- * Returns a DIV representing the dropdown list. The returned DIV will have a
- * new field "selectedOption" containing one of the options in the "options"
- * array, or null if no option is selected/ The returned DIV will have an id
- * with value "id_prefix+'_dropdownList'", which should be unique.
- */
-function dropdownList(id_prefix, options, selected, disabled, onselect, getoptions) {
-    var retdiv = document.createElement("div");
-    var divname = id_prefix + "_dropdownList";
-    retdiv.setAttribute("id", divname);
-    retdiv.setAttribute("class", "dropdownList");
-    retdiv["_isDropDownList"] = true;
-    retdiv["_dropDownList_listener"] = onselect;
-    return dropdownList_ChangeOptions(retdiv, options, selected, disabled, getoptions);
-}
-
-function dropdownList_ChangeOptions(dropdownListDIV, options, selected, disabled, getoptions) {
-    var retdiv = dropdownListDIV;
-    var divname = retdiv.getAttribute("id");
-    if (!retdiv["_isDropDownList"]) {
-        console.error("Cannot provision dropdown list " + divname + " DIV because it is not a dropdown list");
-        return null;
-    }
-    if (options == null && getoptions == null) {
-        console.error("Cannot provision dropdown list " + divname
-                + " DIV because it has no options and no function to get options");
-        return null;
-    }
-    if (disabled && !selected) {
-        console.warn("Provisioning dropdown list " + divname + " that is disabled, but there is no value selected!")
-    }
-    var subdivs = retdiv.querySelectorAll("#" + divname + " > div, button"); // get
-                                                                                // direct
-                                                                                // children
-                                                                                // or
-                                                                                // retdiv
-                                                                                // that
-                                                                                // are
-                                                                                // divs
-    for (var d = 0; d < subdivs.length; d++) {
-        retdiv.removeChild(subdivs[d]);
-    }
-    var onselect = null;
-    if (retdiv["_dropDownList_listener"]) {
-        onselect = retdiv["_dropDownList_listener"];
-    }
-    var display = document.createElement("div");
-    retdiv.appendChild(display);
-    display.setAttribute("id", divname + "_display");
-    retdiv["selectedOption"] = null;
-
-    var button = document.createElement("button");
-    button.setAttribute("class", "ebCombobox-helper");
-    var iconHolder = document.createElement("span");
-    iconHolder.setAttribute("class", "ebCombobox-iconHolder");
-    var icon = document.createElement("i");
-    var iconStyle = "ebIcon ebIcon_small ebIcon_downArrow_10px eb_noVertAlign";
-    if (disabled) {
-        iconStyle += " ebIcon_disabled";
-    }
-    icon.setAttribute("class", iconStyle);
-    iconHolder.appendChild(icon);
-    button.appendChild(iconHolder);
-    retdiv.appendChild(button);
-
-    if (disabled) {
-        display.setAttribute("class", "dropdownList_display_disabled ebInput_width_xLong");
-    } else {
-        display.setAttribute("class", "dropdownList_display ebInput_width_xLong");
-        var onClickFunction = function(event) {
-            dropdownList_display_click(divname, options, selected, disabled, getoptions);
-        };
-        display.onclick = onClickFunction;
-        button.onclick = onClickFunction;
-    }
-    var optionsDIV = document.createElement("div");
-    retdiv.appendChild(optionsDIV);
-    optionsDIV.setAttribute("id", divname + "_options");
-    optionsDIV.setAttribute("class", "dropdownList_options");
-    var optionsSearch = document.createElement("input");
-    optionsDIV.appendChild(optionsSearch);
-    optionsSearch.setAttribute("id", divname + "_search");
-    optionsSearch.setAttribute("type", "input");
-    optionsSearch.setAttribute("placeholder", "Search..");
-    optionsSearch.setAttribute("class", "ebInput ebInput_width_full");
-    optionsSearch.onkeyup = dropdownList_filter_scopePreserver(divname, divname + "_options_list");
-    var optionsUL = document.createElement("ul");
-    optionsUL.setAttribute("class", "dropdownList_options_body");
-    optionsSearch.setAttribute("id", divname + "_search");
-    optionsDIV.appendChild(optionsUL);
-    optionsUL.setAttribute("id", divname + "_options_list_ul");
-    if (options) {
-        for (var i = 0; i < options.length; i++) {
-            var option = document.createElement("li");
-            optionsUL.appendChild(option);
-            option.onclick = dropdownList_option_select_scopePreserver(divname, options[i], onselect);
-            option.innerHTML = options[i].displaytext;
-            if (selected && selected.displaytext && selected.displaytext == options[i].displaytext) {
-                retdiv["selectedOption"] = options[i];
-            }
-        }
-    } else if (getoptions != null && selected != null) {
-        retdiv["selectedOption"] = selected;
-    }
-
-    if (retdiv["selectedOption"] != null) {
-        display.innerHTML = retdiv["selectedOption"].displaytext;
-        display.title = display.innerHTML;
-    } else if (retdiv["selectedOption"] == null && !disabled) {
-        display.innerHTML = "Select an Option";
-    } else if (retdiv["selectedOption"] == null && disabled) {
-        display.innerHTML = "No Option Selected";
-    }
-    return retdiv;
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/edit_area_full.js b/client/client-editor/src/main/resources/webapp/js/edit_area/edit_area_full.js
deleted file mode 100644
index 3521d8301..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/edit_area_full.js
+++ /dev/null
@@ -1,1235 +0,0 @@
- function EAL() {
-     var t = this;
-     t.version = "0.8.2";
-     date = new Date();
-     t.start_time = date.getTime();
-     t.win = "loading";
-     t.error = false;
-     t.baseURL = "";
-     t.template = "";
-     t.lang = {};
-     t.load_syntax = {};
-     t.syntax = {};
-     t.loadedFiles = [];
-     t.waiting_loading = {};
-     t.scripts_to_load = [];
-     t.sub_scripts_to_load = [];
-     t.syntax_display_name = {
-         'basic': 'Basic',
-         'brainfuck': 'Brainfuck',
-         'c': 'C',
-         'coldfusion': 'Coldfusion',
-         'cpp': 'CPP',
-         'css': 'CSS',
-         'html': 'HTML',
-         'java': 'Java',
-         'js': 'Javascript',
-         'pas': 'Pascal',
-         'perl': 'Perl',
-         'php': 'Php',
-         'python': 'Python',
-         'robotstxt': 'Robots txt',
-         'ruby': 'Ruby',
-         'sql': 'SQL',
-         'tsql': 'T-SQL',
-         'vb': 'Visual Basic',
-         'xml': 'XML'
-     };
-     t.resize = [];
-     t.hidden = {};
-     t.default_settings = {
-         debug: false,
-         smooth_selection: true,
-         font_size: "10",
-         font_family: "monospace",
-         start_highlight: false,
-         toolbar: "search,go_to_line,fullscreen,|,undo,redo,|,select_font,|,change_smooth_selection,highlight,reset_highlight,word_wrap,|,help",
-         begin_toolbar: "",
-         end_toolbar: "",
-         is_multi_files: false,
-         allow_resize: "both",
-         show_line_colors: false,
-         min_width: 400,
-         min_height: 125,
-         replace_tab_by_spaces: false,
-         allow_toggle: true,
-         language: "en",
-         syntax: "",
-         syntax_selection_allow: "basic,brainfuck,c,coldfusion,cpp,css,html,java,js,pas,perl,php,python,ruby,robotstxt,sql,tsql,vb,xml",
-         display: "onload",
-         max_undo: 30,
-         browsers: "known",
-         plugins: "",
-         gecko_spellcheck: false,
-         fullscreen: false,
-         is_editable: true,
-         cursor_position: "begin",
-         word_wrap: false,
-         autocompletion: false,
-         load_callback: "",
-         save_callback: "",
-         change_callback: "",
-         submit_callback: "",
-         EA_init_callback: "",
-         EA_delete_callback: "",
-         EA_load_callback: "",
-         EA_unload_callback: "",
-         EA_toggle_on_callback: "",
-         EA_toggle_off_callback: "",
-         EA_file_switch_on_callback: "",
-         EA_file_switch_off_callback: "",
-         EA_file_close_callback: ""
-     };
-     t.advanced_buttons = [
-         ['new_document', 'newdocument.gif', 'new_document', false],
-         ['search', 'search.gif', 'show_search', false],
-         ['go_to_line', 'go_to_line.gif', 'go_to_line', false],
-         ['undo', 'undo.gif', 'undo', true],
-         ['redo', 'redo.gif', 'redo', true],
-         ['change_smooth_selection', 'smooth_selection.gif', 'change_smooth_selection_mode', true],
-         ['reset_highlight', 'reset_highlight.gif', 'resync_highlight', true],
-         ['highlight', 'highlight.gif', 'change_highlight', true],
-         ['help', 'help.gif', 'show_help', false],
-         ['save', 'save.gif', 'save', false],
-         ['load', 'load.gif', 'load', false],
-         ['fullscreen', 'fullscreen.gif', 'toggle_full_screen', false],
-         ['word_wrap', 'word_wrap.gif', 'toggle_word_wrap', true],
-         ['autocompletion', 'autocompletion.gif', 'toggle_autocompletion', true]
-     ];
-     t.set_browser_infos(t);
-     if (t.isIE >= 6 || t.isGecko || (t.isWebKit && !t.isSafari < 3) || t.isOpera >= 9 || t.isCamino) t.isValidBrowser = true;
-     else t.isValidBrowser = false;
-     t.set_base_url();
-     for (var i = 0; i < t.scripts_to_load.length; i++) {
-         setTimeout("eAL.load_script('" + t.baseURL + t.scripts_to_load[i] + ".js');", 1);
-         t.waiting_loading[t.scripts_to_load[i] + ".js"] = false;
-     }
-     t.add_event(window, "load", EAL.prototype.window_loaded);
- };
- EAL.prototype = {
-     has_error: function() {
-         this.error = true;
-         for (var i in EAL.prototype) {
-             EAL.prototype[i] = function() {};
-         }
-     },
-     set_browser_infos: function(o) {
-         ua = navigator.userAgent;
-         o.isWebKit = /WebKit/.test(ua);
-         o.isGecko = !o.isWebKit && /Gecko/.test(ua);
-         o.isMac = /Mac/.test(ua);
-         o.isIE = (navigator.appName == "Microsoft Internet Explorer");
-         if (o.isIE) {
-             o.isIE = ua.replace(/^.*?MSIE\s+([0-9\.]+).*$/, "$1");
-             if (o.isIE < 6) o.has_error();
-         }
-         if (o.isOpera = (ua.indexOf('Opera') != -1)) {
-             o.isOpera = ua.replace(/^.*?Opera.*?([0-9\.]+).*$/i, "$1");
-             if (o.isOpera < 9) o.has_error();
-             o.isIE = false;
-         }
-         if (o.isFirefox = (ua.indexOf('Firefox') != -1)) o.isFirefox = ua.replace(/^.*?Firefox.*?([0-9\.]+).*$/i, "$1");
-         if (ua.indexOf('Iceweasel') != -1) o.isFirefox = ua.replace(/^.*?Iceweasel.*?([0-9\.]+).*$/i, "$1");
-         if (ua.indexOf('GranParadiso') != -1) o.isFirefox = ua.replace(/^.*?GranParadiso.*?([0-9\.]+).*$/i, "$1");
-         if (ua.indexOf('BonEcho') != -1) o.isFirefox = ua.replace(/^.*?BonEcho.*?([0-9\.]+).*$/i, "$1");
-         if (ua.indexOf('SeaMonkey') != -1) o.isFirefox = (ua.replace(/^.*?SeaMonkey.*?([0-9\.]+).*$/i, "$1")) + 1;
-         if (o.isCamino = (ua.indexOf('Camino') != -1)) o.isCamino = ua.replace(/^.*?Camino.*?([0-9\.]+).*$/i, "$1");
-         if (o.isSafari = (ua.indexOf('Safari') != -1)) o.isSafari = ua.replace(/^.*?Version\/([0-9]+\.[0-9]+).*$/i, "$1");
-         if (o.isChrome = (ua.indexOf('Chrome') != -1)) {
-             o.isChrome = ua.replace(/^.*?Chrome.*?([0-9\.]+).*$/i, "$1");
-             o.isSafari = false;
-         }
-     },
-     window_loaded: function() {
-         eAL.win = "loaded";
-         if (document.forms) {
-             for (var i = 0; i < document.forms.length; i++) {
-                 var form = document.forms[i];
-                 form.edit_area_replaced_submit = null;
-                 try {
-                     form.edit_area_replaced_submit = form.onsubmit;
-                     form.onsubmit = "";
-                 } catch (e) {}
-                 eAL.add_event(form, "submit", EAL.prototype.submit);
-                 eAL.add_event(form, "reset", EAL.prototype.reset);
-             }
-         }
-         eAL.add_event(window, "unload", function() {
-             for (var i in eAs) {
-                 eAL.delete_instance(i);
-             }
-         });
-     },
-     init_ie_textarea: function(id) {
-         var a = document.getElementById(id);
-         try {
-             if (a && typeof(a.focused) == "undefined") {
-                 a.focus();
-                 a.focused = true;
-                 a.selectionStart = a.selectionEnd = 0;
-                 get_IE_selection(a);
-                 eAL.add_event(a, "focus", IE_textarea_focus);
-                 eAL.add_event(a, "blur", IE_textarea_blur);
-             }
-         } catch (ex) {}
-     },
-     init: function(settings) {
-         var t = this,
-             s = settings,
-             i;
-         if (!s["id"]) t.has_error();
-         if (t.error) return;
-         if (eAs[s["id"]]) t.delete_instance(s["id"]);
-         for (i in t.default_settings) {
-             if (typeof(s[i]) == "undefined") s[i] = t.default_settings[i];
-         }
-         if (s["browsers"] == "known" && t.isValidBrowser == false) {
-             return;
-         }
-         if (s["begin_toolbar"].length > 0) s["toolbar"] = s["begin_toolbar"] + "," + s["toolbar"];
-         if (s["end_toolbar"].length > 0) s["toolbar"] = s["toolbar"] + "," + s["end_toolbar"];
-         s["tab_toolbar"] = s["toolbar"].replace(/ /g, "").split(",");
-         s["plugins"] = s["plugins"].replace(/ /g, "").split(",");
-         for (i = 0; i < s["plugins"].length; i++) {
-             if (s["plugins"][i].length == 0) s["plugins"].splice(i, 1);
-         }
-         t.get_template();
-         t.load_script(t.baseURL + "langs/" + s["language"] + ".js");
-         if (s["syntax"].length > 0) {
-             s["syntax"] = s["syntax"].toLowerCase();
-             t.load_script(t.baseURL + "reg_syntax/" + s["syntax"] + ".js");
-         }
-         eAs[s["id"]] = {
-             "settings": s
-         };
-         eAs[s["id"]]["displayed"] = false;
-         eAs[s["id"]]["hidden"] = false;
-         t.start(s["id"]);
-     },
-     delete_instance: function(id) {
-         var d = document,
-             fs = window.frames,
-             span, iframe;
-         eAL.execCommand(id, "EA_delete");
-         if (fs["frame_" + id] && fs["frame_" + id].editArea) {
-             if (eAs[id]["displayed"]) eAL.toggle(id, "off");
-             fs["frame_" + id].editArea.execCommand("EA_unload");
-         }
-         span = d.getElementById("EditAreaArroundInfos_" + id);
-         if (span) span.parentNode.removeChild(span);
-         iframe = d.getElementById("frame_" + id);
-         if (iframe) {
-             iframe.parentNode.removeChild(iframe);
-             try {
-                 delete fs["frame_" + id];
-             } catch (e) {}
-         }
-         delete eAs[id];
-     },
-     start: function(id) {
-         var t = this,
-             d = document,
-             f, span, father, next, html = '',
-             html_toolbar_content = '',
-             template, content, i;
-         if (t.win != "loaded") {
-             setTimeout("eAL.start('" + id + "');", 50);
-             return;
-         }
-         for (i in t.waiting_loading) {
-             if (t.waiting_loading[i] != "loaded" && typeof(t.waiting_loading[i]) != "function") {
-                 setTimeout("eAL.start('" + id + "');", 50);
-                 return;
-             }
-         }
-         if (!t.lang[eAs[id]["settings"]["language"]] || (eAs[id]["settings"]["syntax"].length > 0 && !t.load_syntax[eAs[id]["settings"]["syntax"]])) {
-             setTimeout("eAL.start('" + id + "');", 50);
-             return;
-         }
-         if (eAs[id]["settings"]["syntax"].length > 0) t.init_syntax_regexp();
-         if (!d.getElementById("EditAreaArroundInfos_" + id) && (eAs[id]["settings"]["debug"] || eAs[id]["settings"]["allow_toggle"])) {
-             span = d.createElement("span");
-             span.id = "EditAreaArroundInfos_" + id;
-             if (eAs[id]["settings"]["allow_toggle"]) {
-                 checked = (eAs[id]["settings"]["display"] == "onload") ? "checked='checked'" : "";
-                 html += "<div id='edit_area_toggle_" + i + "'>";
-                 html += "<input id='edit_area_toggle_checkbox_" + id + "' class='toggle_" + id + "' type='checkbox' onclick='eAL.toggle(\"" + id + "\");' accesskey='e' " + checked + " />";
-                 html += "<label for='edit_area_toggle_checkbox_" + id + "' class = 'edit_area_toggle_checkbox'>{$toggle}</label></div>";
-             }
-             if (eAs[id]["settings"]["debug"]) html += "<textarea id='edit_area_debug_" + id + "' spellcheck='off' style='z-index:20;width:100%;height:120px;overflow:auto;border:solid black 1px;'></textarea><br />";
-             html = t.translate(html, eAs[id]["settings"]["language"]);
-             span.innerHTML = html;
-             father = d.getElementById(id).parentNode;
-             next = d.getElementById(id).nextSibling;
-             if (next == null) father.appendChild(span);
-             else father.insertBefore(span, next);
-         }
-         if (!eAs[id]["initialized"]) {
-             t.execCommand(id, "EA_init");
-             if (eAs[id]["settings"]["display"] == "later") {
-                 eAs[id]["initialized"] = true;
-                 return;
-             }
-         }
-         if (t.isIE) {
-             t.init_ie_textarea(id);
-         }
-         var area = eAs[id];
-         for (i = 0; i < area["settings"]["tab_toolbar"].length; i++) {
-             html_toolbar_content += t.get_control_html(area["settings"]["tab_toolbar"][i], area["settings"]["language"]);
-         }
-         html_toolbar_content = t.translate(html_toolbar_content, area["settings"]["language"], "template");
-         if (!t.iframe_script) {
-             t.iframe_script = "";
-             for (i = 0; i < t.sub_scripts_to_load.length; i++) t.iframe_script += '<script language="javascript" type="text/javascript" src="' + t.baseURL + t.sub_scripts_to_load[i] + '.js"></script>';
-         }
-         for (i = 0; i < area["settings"]["plugins"].length; i++) {
-             if (!t.all_plugins_loaded) t.iframe_script += '<script language="javascript" type="text/javascript" src="' + t.baseURL + 'plugins/' + area["settings"]["plugins"][i] + '/' + area["settings"]["plugins"][i] + '.js"></script>';
-             t.iframe_script += '<script language="javascript" type="text/javascript" src="' + t.baseURL + 'plugins/' + area["settings"]["plugins"][i] + '/langs/' + area["settings"]["language"] + '.js"></script>';
-         }
-         if (!t.iframe_css) {
-             t.iframe_css = "<link href='" + t.baseURL + "edit_area.css' rel='stylesheet' type='text/css' />";
-         }
-         template = t.template.replace(/\[__BASEURL__\]/g, t.baseURL);
-         template = template.replace("[__TOOLBAR__]", html_toolbar_content);
-         template = t.translate(template, area["settings"]["language"], "template");
-         template = template.replace("[__CSSRULES__]", t.iframe_css);
-         template = template.replace("[__JSCODE__]", t.iframe_script);
-         template = template.replace("[__EA_VERSION__]", t.version);
-         area.textarea = d.getElementById(area["settings"]["id"]);
-         eAs[area["settings"]["id"]]["textarea"] = area.textarea;
-         if (typeof(window.frames["frame_" + area["settings"]["id"]]) != 'undefined') delete window.frames["frame_" + area["settings"]["id"]];
-         father = area.textarea.parentNode;
-         content = d.createElement("iframe");
-         content.name = "frame_" + area["settings"]["id"];
-         content.id = "frame_" + area["settings"]["id"];
-         content.style.borderWidth = "0px";
-         setAttribute(content, "frameBorder", "0");
-         content.style.overflow = "hidden";
-         content.style.display = "none";
-         next = area.textarea.nextSibling;
-         if (next == null) father.appendChild(content);
-         else father.insertBefore(content, next);
-         f = window.frames["frame_" + area["settings"]["id"]];
-         f.document.open();
-         f.eAs = eAs;
-         f.area_id = area["settings"]["id"];
-         f.document.area_id = area["settings"]["id"];
-         f.document.write(template);
-         f.document.close();
-     },
-     toggle: function(id, toggle_to) {
-         if (!toggle_to) toggle_to = (eAs[id]["displayed"] == true) ? "off" : "on";
-         if (eAs[id]["displayed"] == true && toggle_to == "off") {
-             this.toggle_off(id);
-         } else if (eAs[id]["displayed"] == false && toggle_to == "on") {
-             this.toggle_on(id);
-         }
-         return false;
-     },
-     toggle_off: function(id) {
-         var fs = window.frames,
-             f, t, parNod, nxtSib, selStart, selEnd, scrollTop, scrollLeft;
-         if (fs["frame_" + id]) {
-             f = fs["frame_" + id];
-             t = eAs[id]["textarea"];
-             if (f.editArea.fullscreen['isFull']) f.editArea.toggle_full_screen(false);
-             eAs[id]["displayed"] = false;
-             t.wrap = "off";
-             setAttribute(t, "wrap", "off");
-             parNod = t.parentNode;
-             nxtSib = t.nextSibling;
-             parNod.removeChild(t);
-             parNod.insertBefore(t, nxtSib);
-             t.value = f.editArea.textarea.value;
-             selStart = f.editArea.last_selection["selectionStart"];
-             selEnd = f.editArea.last_selection["selectionEnd"];
-             scrollTop = f.document.getElementById("result").scrollTop;
-             scrollLeft = f.document.getElementById("result").scrollLeft;
-             document.getElementById("frame_" + id).style.display = 'none';
-             t.style.display = "inline";
-             try {
-                 t.focus();
-             } catch (e) {};
-             if (this.isIE) {
-                 t.selectionStart = selStart;
-                 t.selectionEnd = selEnd;
-                 t.focused = true;
-                 set_IE_selection(t);
-             } else {
-                 if (this.isOpera && this.isOpera < 9.6) {
-                     t.setSelectionRange(0, 0);
-                 }
-                 try {
-                     t.setSelectionRange(selStart, selEnd);
-                 } catch (e) {};
-             }
-             t.scrollTop = scrollTop;
-             t.scrollLeft = scrollLeft;
-             f.editArea.execCommand("toggle_off");
-         }
-     },
-     toggle_on: function(id) {
-         var fs = window.frames,
-             f, t, selStart = 0,
-             selEnd = 0,
-             scrollTop = 0,
-             scrollLeft = 0,
-             curPos, elem;
-         if (fs["frame_" + id]) {
-             f = fs["frame_" + id];
-             t = eAs[id]["textarea"];
-             area = f.editArea;
-             area.textarea.value = t.value;
-             curPos = eAs[id]["settings"]["cursor_position"];
-             if (t.use_last == true) {
-                 selStart = t.last_selectionStart;
-                 selEnd = t.last_selectionEnd;
-                 scrollTop = t.last_scrollTop;
-                 scrollLeft = t.last_scrollLeft;
-                 t.use_last = false;
-             } else if (curPos == "auto") {
-                 try {
-                     selStart = t.selectionStart;
-                     selEnd = t.selectionEnd;
-                     scrollTop = t.scrollTop;
-                     scrollLeft = t.scrollLeft;
-                 } catch (ex) {}
-             }
-             this.set_editarea_size_from_textarea(id, document.getElementById("frame_" + id));
-             t.style.display = "none";
-             document.getElementById("frame_" + id).style.display = "inline";
-             area.execCommand("focus");
-             eAs[id]["displayed"] = true;
-             area.execCommand("update_size");
-             f.document.getElementById("result").scrollTop = scrollTop;
-             f.document.getElementById("result").scrollLeft = scrollLeft;
-             area.area_select(selStart, selEnd - selStart);
-             area.execCommand("toggle_on");
-         } else {
-             elem = document.getElementById(id);
-             elem.last_selectionStart = elem.selectionStart;
-             elem.last_selectionEnd = elem.selectionEnd;
-             elem.last_scrollTop = elem.scrollTop;
-             elem.last_scrollLeft = elem.scrollLeft;
-             elem.use_last = true;
-             eAL.start(id);
-         }
-     },
-     set_editarea_size_from_textarea: function(id, frame) {
-         var elem, width, height;
-         elem = document.getElementById(id);
-         width = Math.max(eAs[id]["settings"]["min_width"], elem.offsetWidth) + "px";
-         height = Math.max(eAs[id]["settings"]["min_height"], elem.offsetHeight) + "px";
-         if (elem.style.width.indexOf("%") != -1) width = elem.style.width;
-         if (elem.style.height.indexOf("%") != -1) height = elem.style.height;
-         frame.style.width = width;
-         frame.style.height = height;
-     },
-     set_base_url: function() {
-         var t = this,
-             elems, i, docBasePath;
-         if (!this.baseURL) {
-             elems = document.getElementsByTagName('script');
-             for (i = 0; i < elems.length; i++) {
-                 if (elems[i].src && elems[i].src.match(/edit_area_[^\\\/]*$/i)) {
-                     var src = unescape(elems[i].src);
-                     src = src.substring(0, src.lastIndexOf('/'));
-                     this.baseURL = src;
-                     this.file_name = elems[i].src.substr(elems[i].src.lastIndexOf("/") + 1);
-                     break;
-                 }
-             }
-         }
-         docBasePath = document.location.href;
-         if (docBasePath.indexOf('?') != -1) docBasePath = docBasePath.substring(0, docBasePath.indexOf('?'));
-         docBasePath = docBasePath.substring(0, docBasePath.lastIndexOf('/'));
-         if (t.baseURL.indexOf('://') == -1 && t.baseURL.charAt(0) != '/') {
-             t.baseURL = docBasePath + "/" + t.baseURL;
-         }
-         t.baseURL += "/";
-     },
-     get_button_html: function(id, img, exec, isFileSpecific, baseURL) {
-         var cmd, html;
-         if (!baseURL) baseURL = this.baseURL;
-         cmd = 'editArea.execCommand(\'' + exec + '\')';
-         html = '<a id="a_' + id + '" href="javascript:' + cmd + '" onclick="' + cmd + ';return false;" onmousedown="return false;" target="_self" fileSpecific="' + (isFileSpecific ? 'yes' : 'no') + '">';
-         html += '<img id="' + id + '" src="' + baseURL + 'images/' + img + '" title="{$' + id + '}" width="20" height="20" class="editAreaButtonNormal" onmouseover="editArea.switchClass(this,\'editAreaButtonOver\');" onmouseout="editArea.restoreClass(this);" onmousedown="editArea.restoreAndSwitchClass(this,\'editAreaButtonDown\');" /></a>';
-         return html;
-     },
-     get_control_html: function(button_name, lang) {
-         var t = this,
-             i, but, html, si;
-         for (i = 0; i < t.advanced_buttons.length; i++) {
-             but = t.advanced_buttons[i];
-             if (but[0] == button_name) {
-                 return t.get_button_html(but[0], but[1], but[2], but[3]);
-             }
-         }
-         switch (button_name) {
-             case "*":
-             case "return":
-                 return "<br />";
-             case "|":
-             case "separator":
-                 return '<img src="' + t.baseURL + 'images/spacer.gif" width="1" height="15" class="editAreaSeparatorLine">';
-             case "select_font":
-                 html = "<select id='area_font_size' onchange='javascript:editArea.execCommand(\"change_font_size\")' fileSpecific='yes'>";
-                 html += "<option value='-1'>{$font_size}</option>";
-                 si = [8, 9, 10, 11, 12, 14];
-                 for (i = 0; i < si.length; i++) {
-                     html += "<option value='" + si[i] + "'>" + si[i] + " pt</option>";
-                 }
-                 html += "</select>";
-                 return html;
-             case "syntax_selection":
-                 html = "<select id='syntax_selection' onchange='javascript:editArea.execCommand(\"change_syntax\",this.value)' fileSpecific='yes'>";
-                 html += "<option value='-1'>{$syntax_selection}</option>";
-                 html += "</select>";
-                 return html;
-         }
-         return "<span id='tmp_tool_" + button_name + "'>[" + button_name + "]</span>";
-     },
-     get_template: function() {
-         if (this.template == "") {
-             var xhr_object = null;
-             if (window.XMLHttpRequest) xhr_object = new XMLHttpRequest();
-             else if (window.ActiveXObject) xhr_object = new ActiveXObject("Microsoft.XMLHTTP");
-             else {
-                 alert("XMLHTTPRequest not supported. EditArea not loaded");
-                 return;
-             }
-             xhr_object.open("GET", this.baseURL + "template.html", false);
-             xhr_object.send(null);
-             if (xhr_object.readyState == 4) this.template = xhr_object.responseText;
-             else this.has_error();
-         }
-     },
-     translate: function(text, lang, mode) {
-         if (mode == "word") text = eAL.get_word_translation(text, lang);
-         else if (mode = "template") {
-             eAL.current_language = lang;
-             text = text.replace(/\{\$([^\}]+)\}/gm, eAL.translate_template);
-         }
-         return text;
-     },
-     translate_template: function() {
-         return eAL.get_word_translation(EAL.prototype.translate_template.arguments[1], eAL.current_language);
-     },
-     get_word_translation: function(val, lang) {
-         var i;
-         for (i in eAL.lang[lang]) {
-             if (i == val) return eAL.lang[lang][i];
-         }
-         return "_" + val;
-     },
-     load_script: function(url) {
-         var t = this,
-             d = document,
-             script, head;
-         if (t.loadedFiles[url]) return;
-         try {
-             script = d.createElement("script");
-             script.type = "text/javascript";
-             script.src = url;
-             script.charset = "UTF-8";
-             d.getElementsByTagName("head")[0].appendChild(script);
-         } catch (e) {
-             d.write('<sc' + 'ript language="javascript" type="text/javascript" src="' + url + '" charset="UTF-8"></sc' + 'ript>');
-         }
-         t.loadedFiles[url] = true;
-     },
-     add_event: function(obj, name, handler) {
-         try {
-             if (obj.attachEvent) {
-                 obj.attachEvent("on" + name, handler);
-             } else {
-                 obj.addEventListener(name, handler, false);
-             }
-         } catch (e) {}
-     },
-     remove_event: function(obj, name, handler) {
-         try {
-             if (obj.detachEvent) obj.detachEvent("on" + name, handler);
-             else obj.removeEventListener(name, handler, false);
-         } catch (e) {}
-     },
-     reset: function(e) {
-         var formObj, is_child, i, x;
-         formObj = eAL.isIE ? window.event.srcElement : e.target;
-         if (formObj.tagName != 'FORM') formObj = formObj.form;
-         for (i in eAs) {
-             is_child = false;
-             for (x = 0; x < formObj.elements.length; x++) {
-                 if (formObj.elements[x].id == i) is_child = true;
-             }
-             if (window.frames["frame_" + i] && is_child && eAs[i]["displayed"] == true) {
-                 var exec = 'window.frames["frame_' + i + '"].editArea.textarea.value=document.getElementById("' + i + '").value;';
-                 exec += 'window.frames["frame_' + i + '"].editArea.execCommand("focus");';
-                 exec += 'window.frames["frame_' + i + '"].editArea.check_line_selection();';
-                 exec += 'window.frames["frame_' + i + '"].editArea.execCommand("reset");';
-                 window.setTimeout(exec, 10);
-             }
-         }
-         return;
-     },
-     submit: function(e) {
-         var formObj, is_child, fs = window.frames,
-             i, x;
-         formObj = eAL.isIE ? window.event.srcElement : e.target;
-         if (formObj.tagName != 'FORM') formObj = formObj.form;
-         for (i in eAs) {
-             is_child = false;
-             for (x = 0; x < formObj.elements.length; x++) {
-                 if (formObj.elements[x].id == i) is_child = true;
-             }
-             if (is_child) {
-                 if (fs["frame_" + i] && eAs[i]["displayed"] == true) document.getElementById(i).value = fs["frame_" + i].editArea.textarea.value;
-                 eAL.execCommand(i, "EA_submit");
-             }
-         }
-         if (typeof(formObj.edit_area_replaced_submit) == "function") {
-             res = formObj.edit_area_replaced_submit();
-             if (res == false) {
-                 if (eAL.isIE) return false;
-                 else e.preventDefault();
-             }
-         }
-         return;
-     },
-     getValue: function(id) {
-         if (window.frames["frame_" + id] && eAs[id]["displayed"] == true) {
-             return window.frames["frame_" + id].editArea.textarea.value;
-         } else if (elem = document.getElementById(id)) {
-             return elem.value;
-         }
-         return false;
-     },
-     setValue: function(id, new_val) {
-         var fs = window.frames;
-         if ((f = fs["frame_" + id]) && eAs[id]["displayed"] == true) {
-             f.editArea.textarea.value = new_val;
-             f.editArea.execCommand("focus");
-             f.editArea.check_line_selection(false);
-             f.editArea.execCommand("onchange");
-         } else if (elem = document.getElementById(id)) {
-             elem.value = new_val;
-         }
-     },
-     getSelectionRange: function(id) {
-         var sel, eA, fs = window.frames;
-         sel = {
-             "start": 0,
-             "end": 0
-         };
-         if (fs["frame_" + id] && eAs[id]["displayed"] == true) {
-             eA = fs["frame_" + id].editArea;
-             sel["start"] = eA.textarea.selectionStart;
-             sel["end"] = eA.textarea.selectionEnd;
-         } else if (elem = document.getElementById(id)) {
-             sel = getSelectionRange(elem);
-         }
-         return sel;
-     },
-     setSelectionRange: function(id, new_start, new_end) {
-         var fs = window.frames;
-         if (fs["frame_" + id] && eAs[id]["displayed"] == true) {
-             fs["frame_" + id].editArea.area_select(new_start, new_end - new_start);
-             if (!this.isIE) {
-                 fs["frame_" + id].editArea.check_line_selection(false);
-                 fs["frame_" + id].editArea.scroll_to_view();
-             }
-         } else if (elem = document.getElementById(id)) {
-             setSelectionRange(elem, new_start, new_end);
-         }
-     },
-     getSelectedText: function(id) {
-         var sel = this.getSelectionRange(id);
-         return this.getValue(id).substring(sel["start"], sel["end"]);
-     },
-     setSelectedText: function(id, new_val) {
-         var fs = window.frames,
-             d = document,
-             sel, text, scrollTop, scrollLeft, new_sel_end;
-         new_val = new_val.replace(/\r/g, "");
-         sel = this.getSelectionRange(id);
-         text = this.getValue(id);
-         if (fs["frame_" + id] && eAs[id]["displayed"] == true) {
-             scrollTop = fs["frame_" + id].document.getElementById("result").scrollTop;
-             scrollLeft = fs["frame_" + id].document.getElementById("result").scrollLeft;
-         } else {
-             scrollTop = d.getElementById(id).scrollTop;
-             scrollLeft = d.getElementById(id).scrollLeft;
-         }
-         text = text.substring(0, sel["start"]) + new_val + text.substring(sel["end"]);
-         this.setValue(id, text);
-         new_sel_end = sel["start"] + new_val.length;
-         this.setSelectionRange(id, sel["start"], new_sel_end);
-         if (new_val != this.getSelectedText(id).replace(/\r/g, "")) {
-             this.setSelectionRange(id, sel["start"], new_sel_end + new_val.split("\n").length - 1);
-         }
-         if (fs["frame_" + id] && eAs[id]["displayed"] == true) {
-             fs["frame_" + id].document.getElementById("result").scrollTop = scrollTop;
-             fs["frame_" + id].document.getElementById("result").scrollLeft = scrollLeft;
-             fs["frame_" + id].editArea.execCommand("onchange");
-         } else {
-             d.getElementById(id).scrollTop = scrollTop;
-             d.getElementById(id).scrollLeft = scrollLeft;
-         }
-     },
-     insertTags: function(id, open_tag, close_tag) {
-         var old_sel, new_sel;
-         old_sel = this.getSelectionRange(id);
-         text = open_tag + this.getSelectedText(id) + close_tag;
-         eAL.setSelectedText(id, text);
-         new_sel = this.getSelectionRange(id);
-         if (old_sel["end"] > old_sel["start"]) this.setSelectionRange(id, new_sel["end"], new_sel["end"]);
-         else this.setSelectionRange(id, old_sel["start"] + open_tag.length, old_sel["start"] + open_tag.length);
-     },
-     hide: function(id) {
-         var fs = window.frames,
-             d = document,
-             t = this,
-             scrollTop, scrollLeft, span;
-         if (d.getElementById(id) && !t.hidden[id]) {
-             t.hidden[id] = {};
-             t.hidden[id]["selectionRange"] = t.getSelectionRange(id);
-             if (d.getElementById(id).style.display != "none") {
-                 t.hidden[id]["scrollTop"] = d.getElementById(id).scrollTop;
-                 t.hidden[id]["scrollLeft"] = d.getElementById(id).scrollLeft;
-             }
-             if (fs["frame_" + id]) {
-                 t.hidden[id]["toggle"] = eAs[id]["displayed"];
-                 if (fs["frame_" + id] && eAs[id]["displayed"] == true) {
-                     scrollTop = fs["frame_" + id].document.getElementById("result").scrollTop;
-                     scrollLeft = fs["frame_" + id].document.getElementById("result").scrollLeft;
-                 } else {
-                     scrollTop = d.getElementById(id).scrollTop;
-                     scrollLeft = d.getElementById(id).scrollLeft;
-                 }
-                 t.hidden[id]["scrollTop"] = scrollTop;
-                 t.hidden[id]["scrollLeft"] = scrollLeft;
-                 if (eAs[id]["displayed"] == true) eAL.toggle_off(id);
-             }
-             span = d.getElementById("EditAreaArroundInfos_" + id);
-             if (span) {
-                 span.style.display = 'none';
-             }
-             d.getElementById(id).style.display = "none";
-         }
-     },
-     show: function(id) {
-         var fs = window.frames,
-             d = document,
-             t = this,
-             span;
-         if ((elem = d.getElementById(id)) && t.hidden[id]) {
-             elem.style.display = "inline";
-             elem.scrollTop = t.hidden[id]["scrollTop"];
-             elem.scrollLeft = t.hidden[id]["scrollLeft"];
-             span = d.getElementById("EditAreaArroundInfos_" + id);
-             if (span) {
-                 span.style.display = 'inline';
-             }
-             if (fs["frame_" + id]) {
-                 elem.style.display = "inline";
-                 if (t.hidden[id]["toggle"] == true) eAL.toggle_on(id);
-                 scrollTop = t.hidden[id]["scrollTop"];
-                 scrollLeft = t.hidden[id]["scrollLeft"];
-                 if (fs["frame_" + id] && eAs[id]["displayed"] == true) {
-                     fs["frame_" + id].document.getElementById("result").scrollTop = scrollTop;
-                     fs["frame_" + id].document.getElementById("result").scrollLeft = scrollLeft;
-                 } else {
-                     elem.scrollTop = scrollTop;
-                     elem.scrollLeft = scrollLeft;
-                 }
-             }
-             sel = t.hidden[id]["selectionRange"];
-             t.setSelectionRange(id, sel["start"], sel["end"]);
-             delete t.hidden[id];
-         }
-     },
-     getCurrentFile: function(id) {
-         return this.execCommand(id, 'get_file', this.execCommand(id, 'curr_file'));
-     },
-     getFile: function(id, file_id) {
-         return this.execCommand(id, 'get_file', file_id);
-     },
-     getAllFiles: function(id) {
-         return this.execCommand(id, 'get_all_files()');
-     },
-     openFile: function(id, file_infos) {
-         return this.execCommand(id, 'open_file', file_infos);
-     },
-     closeFile: function(id, file_id) {
-         return this.execCommand(id, 'close_file', file_id);
-     },
-     setFileEditedMode: function(id, file_id, to) {
-         var reg1, reg2;
-         reg1 = new RegExp('\\\\', 'g');
-         reg2 = new RegExp('"', 'g');
-         return this.execCommand(id, 'set_file_edited_mode("' + file_id.replace(reg1, '\\\\').replace(reg2, '\\"') + '",' + to + ')');
-     },
-     execCommand: function(id, cmd, fct_param) {
-         switch (cmd) {
-             case "EA_init":
-                 if (eAs[id]['settings']["EA_init_callback"].length > 0) eval(eAs[id]['settings']["EA_init_callback"] + "('" + id + "');");
-                 break;
-             case "EA_delete":
-                 if (eAs[id]['settings']["EA_delete_callback"].length > 0) eval(eAs[id]['settings']["EA_delete_callback"] + "('" + id + "');");
-                 break;
-             case "EA_submit":
-                 if (eAs[id]['settings']["submit_callback"].length > 0) eval(eAs[id]['settings']["submit_callback"] + "('" + id + "');");
-                 break;
-         }
-         if (window.frames["frame_" + id] && window.frames["frame_" + id].editArea) {
-             if (fct_param != undefined) return eval('window.frames["frame_' + id + '"].editArea.' + cmd + '(fct_param);');
-             else return eval('window.frames["frame_' + id + '"].editArea.' + cmd + ';');
-         }
-         return false;
-     }
- };
- var eAL = new EAL();
- var eAs = {};
-
- function getAttribute(elm, aName) {
-     var aValue, taName, i;
-     try {
-         aValue = elm.getAttribute(aName);
-     } catch (exept) {}
-     if (!aValue) {
-         for (i = 0; i < elm.attributes.length; i++) {
-             taName = elm.attributes[i].name.toLowerCase();
-             if (taName == aName) {
-                 aValue = elm.attributes[i].value;
-                 return aValue;
-             }
-         }
-     }
-     return aValue;
- };
-
- function setAttribute(elm, attr, val) {
-     if (attr == "class") {
-         elm.setAttribute("className", val);
-         elm.setAttribute("class", val);
-     } else {
-         elm.setAttribute(attr, val);
-     }
- };
-
- function getChildren(elem, elem_type, elem_attribute, elem_attribute_match, option, depth) {
-     if (!option) var option = "single";
-     if (!depth) var depth = -1;
-     if (elem) {
-         var children = elem.childNodes;
-         var result = null;
-         var results = [];
-         for (var x = 0; x < children.length; x++) {
-             strTagName = new String(children[x].tagName);
-             children_class = "?";
-             if (strTagName != "undefined") {
-                 child_attribute = getAttribute(children[x], elem_attribute);
-                 if ((strTagName.toLowerCase() == elem_type.toLowerCase() || elem_type == "") && (elem_attribute == "" || child_attribute == elem_attribute_match)) {
-                     if (option == "all") {
-                         results.push(children[x]);
-                     } else {
-                         return children[x];
-                     }
-                 }
-                 if (depth != 0) {
-                     result = getChildren(children[x], elem_type, elem_attribute, elem_attribute_match, option, depth - 1);
-                     if (option == "all") {
-                         if (result.length > 0) {
-                             results = results.concat(result);
-                         }
-                     } else if (result != null) {
-                         return result;
-                     }
-                 }
-             }
-         }
-         if (option == "all") return results;
-     }
-     return null;
- };
-
- function isChildOf(elem, parent) {
-     if (elem) {
-         if (elem == parent) return true;
-         while (elem.parentNode != 'undefined') {
-             return isChildOf(elem.parentNode, parent);
-         }
-     }
-     return false;
- };
-
- function getMouseX(e) {
-     if (e != null && typeof(e.pageX) != "undefined") {
-         return e.pageX;
-     } else {
-         return (e != null ? e.x : event.x) + document.documentElement.scrollLeft;
-     }
- };
-
- function getMouseY(e) {
-     if (e != null && typeof(e.pageY) != "undefined") {
-         return e.pageY;
-     } else {
-         return (e != null ? e.y : event.y) + document.documentElement.scrollTop;
-     }
- };
-
- function calculeOffsetLeft(r) {
-     return calculeOffset(r, "offsetLeft")
- };
-
- function calculeOffsetTop(r) {
-     return calculeOffset(r, "offsetTop")
- };
-
- function calculeOffset(element, attr) {
-     var offset = 0;
-     while (element) {
-         offset += element[attr];
-         element = element.offsetParent
-     }
-     return offset;
- };
-
- function get_css_property(elem, prop) {
-     if (document.defaultView) {
-         return document.defaultView.getComputedStyle(elem, null).getPropertyValue(prop);
-     } else if (elem.currentStyle) {
-         var prop = prop.replace(/-\D/gi, function(sMatch) {
-             return sMatch.charAt(sMatch.length - 1).toUpperCase();
-         });
-         return elem.currentStyle[prop];
-     } else return null;
- }
- var _mCE;
-
- function start_move_element(e, id, frame) {
-     var elem_id = (e.target || e.srcElement).id;
-     if (id) elem_id = id;
-     if (!frame) frame = window;
-     if (frame.event) e = frame.event;
-     _mCE = frame.document.getElementById(elem_id);
-     _mCE.frame = frame;
-     frame.document.onmousemove = move_element;
-     frame.document.onmouseup = end_move_element;
-     mouse_x = getMouseX(e);
-     mouse_y = getMouseY(e);
-     _mCE.start_pos_x = mouse_x - (_mCE.style.left.replace("px", "") || calculeOffsetLeft(_mCE));
-     _mCE.start_pos_y = mouse_y - (_mCE.style.top.replace("px", "") || calculeOffsetTop(_mCE));
-     return false;
- };
-
- function end_move_element(e) {
-     _mCE.frame.document.onmousemove = "";
-     _mCE.frame.document.onmouseup = "";
-     _mCE = null;
- };
-
- function move_element(e) {
-     var newTop, newLeft, maxLeft;
-     if (_mCE.frame && _mCE.frame.event) e = _mCE.frame.event;
-     newTop = getMouseY(e) - _mCE.start_pos_y;
-     newLeft = getMouseX(e) - _mCE.start_pos_x;
-     maxLeft = _mCE.frame.document.body.offsetWidth - _mCE.offsetWidth;
-     max_top = _mCE.frame.document.body.offsetHeight - _mCE.offsetHeight;
-     newTop = Math.min(Math.max(0, newTop), max_top);
-     newLeft = Math.min(Math.max(0, newLeft), maxLeft);
-     _mCE.style.top = newTop + "px";
-     _mCE.style.left = newLeft + "px";
-     return false;
- };
- var nav = eAL.nav;
-
- function getSelectionRange(textarea) {
-     return {
-         "start": textarea.selectionStart,
-         "end": textarea.selectionEnd
-     };
- };
-
- function setSelectionRange(t, start, end) {
-     t.focus();
-     start = Math.max(0, Math.min(t.value.length, start));
-     end = Math.max(start, Math.min(t.value.length, end));
-     if (nav.isOpera && nav.isOpera < 9.6) {
-         t.selectionEnd = 1;
-         t.selectionStart = 0;
-         t.selectionEnd = 1;
-         t.selectionStart = 0;
-     }
-     t.selectionStart = start;
-     t.selectionEnd = end;
-     if (nav.isIE) set_IE_selection(t);
- };
-
- function get_IE_selection(t) {
-     var d = document,
-         div, range, stored_range, elem, scrollTop, relative_top, line_start, line_nb, range_start, range_end, tab;
-     if (t && t.focused) {
-         if (!t.ea_line_height) {
-             div = d.createElement("div");
-             div.style.fontFamily = get_css_property(t, "font-family");
-             div.style.fontSize = get_css_property(t, "font-size");
-             div.style.visibility = "hidden";
-             div.innerHTML = "0";
-             d.body.appendChild(div);
-             t.ea_line_height = div.offsetHeight;
-             d.body.removeChild(div);
-         }
-         range = d.selection.createRange();
-         try {
-             stored_range = range.duplicate();
-             stored_range.moveToElementText(t);
-             stored_range.setEndPoint('EndToEnd', range);
-             if (stored_range.parentElement() == t) {
-                 elem = t;
-                 scrollTop = 0;
-                 while (elem.parentNode) {
-                     scrollTop += elem.scrollTop;
-                     elem = elem.parentNode;
-                 }
-                 relative_top = range.offsetTop - calculeOffsetTop(t) + scrollTop;
-                 line_start = Math.round((relative_top / t.ea_line_height) + 1);
-                 line_nb = Math.round(range.boundingHeight / t.ea_line_height);
-                 range_start = stored_range.text.length - range.text.length;
-                 tab = t.value.substr(0, range_start).split("\n");
-                 range_start += (line_start - tab.length) * 2;
-                 t.selectionStart = range_start;
-                 range_end = t.selectionStart + range.text.length;
-                 tab = t.value.substr(0, range_start + range.text.length).split("\n");
-                 range_end += (line_start + line_nb - 1 - tab.length) * 2;
-                 t.selectionEnd = range_end;
-             }
-         } catch (e) {}
-     }
-     if (t && t.id) {
-         setTimeout("get_IE_selection(document.getElementById('" + t.id + "'));", 50);
-     }
- };
-
- function IE_textarea_focus() {
-     event.srcElement.focused = true;
- }
-
- function IE_textarea_blur() {
-     event.srcElement.focused = false;
- }
-
- function set_IE_selection(t) {
-     var nbLineStart, nbLineStart, nbLineEnd, range;
-     if (!window.closed) {
-         nbLineStart = t.value.substr(0, t.selectionStart).split("\n").length - 1;
-         nbLineEnd = t.value.substr(0, t.selectionEnd).split("\n").length - 1;
-         try {
-             range = document.selection.createRange();
-             range.moveToElementText(t);
-             range.setEndPoint('EndToStart', range);
-             range.moveStart('character', t.selectionStart - nbLineStart);
-             range.moveEnd('character', t.selectionEnd - nbLineEnd - (t.selectionStart - nbLineStart));
-             range.select();
-         } catch (e) {}
-     }
- };
- eAL.waiting_loading["elements_functions.js"] = "loaded";
- EAL.prototype.start_resize_area = function() {
-     var d = document,
-         a, div, width, height, father;
-     d.onmouseup = eAL.end_resize_area;
-     d.onmousemove = eAL.resize_area;
-     eAL.toggle(eAL.resize["id"]);
-     a = eAs[eAL.resize["id"]]["textarea"];
-     div = d.getElementById("edit_area_resize");
-     if (!div) {
-         div = d.createElement("div");
-         div.id = "edit_area_resize";
-         div.style.border = "dashed #888888 1px";
-     }
-     width = a.offsetWidth - 2;
-     height = a.offsetHeight - 2;
-     div.style.display = "block";
-     div.style.width = width + "px";
-     div.style.height = height + "px";
-     father = a.parentNode;
-     father.insertBefore(div, a);
-     a.style.display = "none";
-     eAL.resize["start_top"] = calculeOffsetTop(div);
-     eAL.resize["start_left"] = calculeOffsetLeft(div);
- };
- EAL.prototype.end_resize_area = function(e) {
-     var d = document,
-         div, a, width, height;
-     d.onmouseup = "";
-     d.onmousemove = "";
-     div = d.getElementById("edit_area_resize");
-     a = eAs[eAL.resize["id"]]["textarea"];
-     width = Math.max(eAs[eAL.resize["id"]]["settings"]["min_width"], div.offsetWidth - 4);
-     height = Math.max(eAs[eAL.resize["id"]]["settings"]["min_height"], div.offsetHeight - 4);
-     if (eAL.isIE == 6) {
-         width -= 2;
-         height -= 2;
-     }
-     a.style.width = width + "px";
-     a.style.height = height + "px";
-     div.style.display = "none";
-     a.style.display = "inline";
-     a.selectionStart = eAL.resize["selectionStart"];
-     a.selectionEnd = eAL.resize["selectionEnd"];
-     eAL.toggle(eAL.resize["id"]);
-     return false;
- };
- EAL.prototype.resize_area = function(e) {
-     var allow, newHeight, newWidth;
-     allow = eAs[eAL.resize["id"]]["settings"]["allow_resize"];
-     if (allow == "both" || allow == "y") {
-         newHeight = Math.max(20, getMouseY(e) - eAL.resize["start_top"]);
-         document.getElementById("edit_area_resize").style.height = newHeight + "px";
-     }
-     if (allow == "both" || allow == "x") {
-         newWidth = Math.max(20, getMouseX(e) - eAL.resize["start_left"]);
-         document.getElementById("edit_area_resize").style.width = newWidth + "px";
-     }
-     return false;
- };
- eAL.waiting_loading["resize_area.js"] = "loaded";
- EAL.prototype.get_regexp = function(text_array) {
-     res = "(\\b)(";
-     for (i = 0; i < text_array.length; i++) {
-         if (i > 0) res += "|";
-         res += this.get_escaped_regexp(text_array[i]);
-     }
-     res += ")(\\b)";
-     reg = new RegExp(res);
-     return res;
- };
- EAL.prototype.get_escaped_regexp = function(str) {
-     return str.toString().replace(/(\.|\?|\*|\+|\\|\(|\)|\[|\]|\}|\{|\$|\^|\|)/g, "\\$1");
- };
- EAL.prototype.init_syntax_regexp = function() {
-     var lang_style = {};
-     for (var lang in this.load_syntax) {
-         if (!this.syntax[lang]) {
-             this.syntax[lang] = {};
-             this.syntax[lang]["keywords_reg_exp"] = {};
-             this.keywords_reg_exp_nb = 0;
-             if (this.load_syntax[lang]['KEYWORDS']) {
-                 param = "g";
-                 if (this.load_syntax[lang]['KEYWORD_CASE_SENSITIVE'] === false) param += "i";
-                 for (var i in this.load_syntax[lang]['KEYWORDS']) {
-                     if (typeof(this.load_syntax[lang]['KEYWORDS'][i]) == "function") continue;
-                     this.syntax[lang]["keywords_reg_exp"][i] = new RegExp(this.get_regexp(this.load_syntax[lang]['KEYWORDS'][i]), param);
-                     this.keywords_reg_exp_nb++;
-                 }
-             }
-             if (this.load_syntax[lang]['OPERATORS']) {
-                 var str = "";
-                 var nb = 0;
-                 for (var i in this.load_syntax[lang]['OPERATORS']) {
-                     if (typeof(this.load_syntax[lang]['OPERATORS'][i]) == "function") continue;
-                     if (nb > 0) str += "|";
-                     str += this.get_escaped_regexp(this.load_syntax[lang]['OPERATORS'][i]);
-                     nb++;
-                 }
-                 if (str.length > 0) this.syntax[lang]["operators_reg_exp"] = new RegExp("(" + str + ")", "g");
-             }
-             if (this.load_syntax[lang]['DELIMITERS']) {
-                 var str = "";
-                 var nb = 0;
-                 for (var i in this.load_syntax[lang]['DELIMITERS']) {
-                     if (typeof(this.load_syntax[lang]['DELIMITERS'][i]) == "function") continue;
-                     if (nb > 0) str += "|";
-                     str += this.get_escaped_regexp(this.load_syntax[lang]['DELIMITERS'][i]);
-                     nb++;
-                 }
-                 if (str.length > 0) this.syntax[lang]["delimiters_reg_exp"] = new RegExp("(" + str + ")", "g");
-             }
-             var syntax_trace = [];
-             this.syntax[lang]["quotes"] = {};
-             var quote_tab = [];
-             if (this.load_syntax[lang]['QUOTEMARKS']) {
-                 for (var i in this.load_syntax[lang]['QUOTEMARKS']) {
-                     if (typeof(this.load_syntax[lang]['QUOTEMARKS'][i]) == "function") continue;
-                     var x = this.get_escaped_regexp(this.load_syntax[lang]['QUOTEMARKS'][i]);
-                     this.syntax[lang]["quotes"][x] = x;
-                     quote_tab[quote_tab.length] = "(" + x + "(\\\\.|[^" + x + "])*(?:" + x + "|$))";
-                     syntax_trace.push(x);
-                 }
-             }
-             this.syntax[lang]["comments"] = {};
-             if (this.load_syntax[lang]['COMMENT_SINGLE']) {
-                 for (var i in this.load_syntax[lang]['COMMENT_SINGLE']) {
-                     if (typeof(this.load_syntax[lang]['COMMENT_SINGLE'][i]) == "function") continue;
-                     var x = this.get_escaped_regexp(this.load_syntax[lang]['COMMENT_SINGLE'][i]);
-                     quote_tab[quote_tab.length] = "(" + x + "(.|\\r|\\t)*(\\n|$))";
-                     syntax_trace.push(x);
-                     this.syntax[lang]["comments"][x] = "\n";
-                 }
-             }
-             if (this.load_syntax[lang]['COMMENT_MULTI']) {
-                 for (var i in this.load_syntax[lang]['COMMENT_MULTI']) {
-                     if (typeof(this.load_syntax[lang]['COMMENT_MULTI'][i]) == "function") continue;
-                     var start = this.get_escaped_regexp(i);
-                     var end = this.get_escaped_regexp(this.load_syntax[lang]['COMMENT_MULTI'][i]);
-                     quote_tab[quote_tab.length] = "(" + start + "(.|\\n|\\r)*?(" + end + "|$))";
-                     syntax_trace.push(start);
-                     syntax_trace.push(end);
-                     this.syntax[lang]["comments"][i] = this.load_syntax[lang]['COMMENT_MULTI'][i];
-                 }
-             }
-             if (quote_tab.length > 0) this.syntax[lang]["comment_or_quote_reg_exp"] = new RegExp("(" + quote_tab.join("|") + ")", "gi");
-             if (syntax_trace.length > 0) this.syntax[lang]["syntax_trace_regexp"] = new RegExp("((.|\n)*?)(\\\\*(" + syntax_trace.join("|") + "|$))", "gmi");
-             if (this.load_syntax[lang]['SCRIPT_DELIMITERS']) {
-                 this.syntax[lang]["script_delimiters"] = {};
-                 for (var i in this.load_syntax[lang]['SCRIPT_DELIMITERS']) {
-                     if (typeof(this.load_syntax[lang]['SCRIPT_DELIMITERS'][i]) == "function") continue;
-                     this.syntax[lang]["script_delimiters"][i] = this.load_syntax[lang]['SCRIPT_DELIMITERS'];
-                 }
-             }
-             this.syntax[lang]["custom_regexp"] = {};
-             if (this.load_syntax[lang]['REGEXPS']) {
-                 for (var i in this.load_syntax[lang]['REGEXPS']) {
-                     if (typeof(this.load_syntax[lang]['REGEXPS'][i]) == "function") continue;
-                     var val = this.load_syntax[lang]['REGEXPS'][i];
-                     if (!this.syntax[lang]["custom_regexp"][val['execute']]) this.syntax[lang]["custom_regexp"][val['execute']] = {};
-                     this.syntax[lang]["custom_regexp"][val['execute']][i] = {
-                         'regexp': new RegExp(val['search'], val['modifiers']),
-                         'class': val['class']
-                     };
-                 }
-             }
-             if (this.load_syntax[lang]['STYLES']) {
-                 lang_style[lang] = {};
-                 for (var i in this.load_syntax[lang]['STYLES']) {
-                     if (typeof(this.load_syntax[lang]['STYLES'][i]) == "function") continue;
-                     if (typeof(this.load_syntax[lang]['STYLES'][i]) != "string") {
-                         for (var j in this.load_syntax[lang]['STYLES'][i]) {
-                             lang_style[lang][j] = this.load_syntax[lang]['STYLES'][i][j];
-                         }
-                     } else {
-                         lang_style[lang][i] = this.load_syntax[lang]['STYLES'][i];
-                     }
-                 }
-             }
-             var style = "";
-             for (var i in lang_style[lang]) {
-                 if (lang_style[lang][i].length > 0) {
-                     style += "." + lang + " ." + i.toLowerCase() + " span{" + lang_style[lang][i] + "}\n";
-                     style += "." + lang + " ." + i.toLowerCase() + "{" + lang_style[lang][i] + "}\n";
-                 }
-             }
-             this.syntax[lang]["styles"] = style;
-         }
-     }
- };
- eAL.waiting_loading["reg_syntax.js"] = "loaded";
- var editAreaLoader = eAL;
- var editAreas = eAs;
- EditAreaLoader = EAL;
- editAreaLoader.iframe_script = "<script type='text/javascript'> Ã EA(){var t=Á;t.error=Ì;t.inlinePopup=[{popup_id:\"area_search_replace\",icon_id:\"search\"},{popup_id:\"edit_area_help\",icon_id:\"help\"}];t.plugins={};t.line_number=0;È.eAL.set_browser_infos(t);if(t.isIE >=8)t.isIE=7;t.É={};t.last_text_to_highlight=\"\";t.last_hightlighted_text=\"\";t.syntax_list=[];t.allready_used_syntax={};t.check_line_selection_timer=50;t.ÂFocused=Ì;t.highlight_selection_line=null;t.previous=[];t.next=[];t.last_undo=\"\";t.files={};t.filesIdAssoc={};t.curr_file='';t.assocBracket={};t.revertAssocBracket={};t.assocBracket[\"(\"]=\")\";t.assocBracket[\"{\"]=\"}\";t.assocBracket[\"[\"]=\"]\";for(var index in t.assocBracket){t.revertAssocBracket[t.assocBracket[index]]=index;}t.is_editable=Ë;t.lineHeight=16;t.tab_nb_char=8;if(t.isOpera)t.tab_nb_char=6;t.is_tabbing=Ì;t.fullscreen={'isFull':Ì};t.isResizing=Ì;t.id=area_id;t.Å=eAs[t.id][\"Å\"];if((\"\"+t.Å['replace_tab_by_spaces']).match(/^[0-9]+$/)){t.tab_nb_char=t.Å['replace_tab_by_spaces'];t.tabulation=\"\";for(var i=0;i<t.tab_nb_char;i++)t.tabulation+=\" \";}\nelse{t.tabulation=\"\t\";}if(t.Å[\"syntax_selection_allow\"]&&t.Å[\"syntax_selection_allow\"].Æ>0)t.syntax_list=t.Å[\"syntax_selection_allow\"].replace(/ /g,\"\").split(\",\");if(t.Å['syntax'])t.allready_used_syntax[t.Å['syntax']]=Ë;};EA.Ä.init=Ã(){var t=Á,a,s=t.Å;t.Â=_$(\"Â\");t.container=_$(\"container\");t.result=_$(\"result\");t.content_highlight=_$(\"content_highlight\");t.selection_field=_$(\"selection_field\");t.selection_field_text=_$(\"selection_field_text\");t.processing_screen=_$(\"processing\");t.editor_area=_$(\"editor\");t.tab_browsing_area=_$(\"tab_browsing_area\");t.test_font_size=_$(\"test_font_size\");a=t.Â;if(!s['is_editable'])t.set_editable(Ì);t.set_show_line_colors(s['show_line_colors']);if(syntax_selec=_$(\"syntax_selection\")){for(var i=0;i<t.syntax_list.Æ;i++){var syntax=t.syntax_list[i];var option=document.createElement(\"option\");option.Ê=syntax;if(syntax==s['syntax'])option.selected=\"selected\";dispSyntax=È.eAL.syntax_display_name[ syntax ];option.innerHTML=typeof(dispSyntax)=='undefined' ? syntax.substring(0,1).toUpperCase()+syntax.substring(1):dispSyntax;syntax_selec.appendChild(option);}}spans=È.getChildren(_$(\"toolbar_1\"),\"span\",\"\",\"\",\"all\",-1);for(var i=0;i<spans.Æ;i++){id=spans[i].id.replace(/tmp_tool_(.*)/,\"$1\");if(id!=spans[i].id){for(var j in t.plugins){if(typeof(t.plugins[j].get_control_html)==\"Ã\"){html=t.plugins[j].get_control_html(id);if(html!=Ì){html=t.get_translation(html,\"template\");var new_span=document.createElement(\"span\");new_span.innerHTML=html;var father=spans[i].ÈNode;spans[i].ÈNode.replaceChild(new_span,spans[i]);break;}}}}}if(s[\"debug\"]){t.debug=È.document.getElementById(\"edit_area_debug_\"+t.id);}if(_$(\"redo\")!=null)t.switchClassSticky(_$(\"redo\"),'editAreaButtonDisabled',Ë);if(typeof(È.eAL.syntax[s[\"syntax\"]])!=\"undefined\"){for(var i in È.eAL.syntax){if(typeof(È.eAL.syntax[i][\"Çs\"])!=\"undefined\"){t.add_Ç(È.eAL.syntax[i][\"Çs\"]);}}}if(t.isOpera)_$(\"editor\").onkeypress=keyDown;\nelse _$(\"editor\").onkeydown=keyDown;for(var i=0;i<t.inlinePopup.Æ;i++){if(t.isOpera)_$(t.inlinePopup[i][\"popup_id\"]).onkeypress=keyDown;\nelse _$(t.inlinePopup[i][\"popup_id\"]).onkeydown=keyDown;}if(s[\"allow_resize\"]==\"both\"||s[\"allow_resize\"]==\"x\"||s[\"allow_resize\"]==\"y\")t.allow_resize(Ë);È.eAL.toggle(t.id,\"on\");t.change_smooth_selection_mode(eA.smooth_selection);t.execCommand(\"change_highlight\",s[\"start_highlight\"]);t.set_font(eA.Å[\"font_family\"],eA.Å[\"font_size\"]);children=È.getChildren(document.body,\"\",\"selec\",\"none\",\"all\",-1);for(var i=0;i<children.Æ;i++){if(t.isIE)children[i].unselectable=Ë;\nelse children[i].onmousedown=Ã(){return Ì};}a.spellcheck=s[\"gecko_spellcheck\"];if(t.isFirefox >='3'){t.content_highlight.Ç.paddingLeft=\"1px\";t.selection_field.Ç.paddingLeft=\"1px\";t.selection_field_text.Ç.paddingLeft=\"1px\";}if(t.isIE&&t.isIE < 8){a.Ç.marginTop=\"-1px\";}if(t.isSafari){t.editor_area.Ç.position=\"absolute\";a.Ç.marginLeft=\"-3px\";if(t.isSafari < 3.2)a.Ç.marginTop=\"1px\";}È.eAL.add_event(t.result,\"click\",Ã(e){if((e.target||e.srcElement)==eA.result){eA.area_select(eA.Â.Ê.Æ,0);}});if(s['is_multi_files']!=Ì)t.open_file({'id':t.curr_file,'text':''});t.set_word_wrap(s['word_wrap']);setTimeout(\"eA.focus();eA.manage_size();eA.execCommand('EA_load');\",10);t.check_undo();t.check_line_selection(Ë);t.scroll_to_view();for(var i in t.plugins){if(typeof(t.plugins[i].onload)==\"Ã\")t.plugins[i].onload();}if(s['fullscreen']==Ë)t.toggle_full_screen(Ë);È.eAL.add_event(window,\"resize\",eA.update_size);È.eAL.add_event(È.window,\"resize\",eA.update_size);È.eAL.add_event(top.window,\"resize\",eA.update_size);È.eAL.add_event(window,\"unload\",Ã(){if(È.eAL){È.eAL.remove_event(È.window,\"resize\",eA.update_size);È.eAL.remove_event(top.window,\"resize\",eA.update_size);}if(eAs[eA.id]&&eAs[eA.id][\"displayed\"]){eA.execCommand(\"EA_unload\");}});};EA.Ä.update_size=Ã(){var d=document,pd=È.document,height,width,popup,maxLeft,maxTop;if(typeof eAs !='undefined'&&eAs[eA.id]&&eAs[eA.id][\"displayed\"]==Ë){if(eA.fullscreen['isFull']){pd.getElementById(\"frame_\"+eA.id).Ç.width=pd.getElementsByTagName(\"html\")[0].clientWidth+\"px\";pd.getElementById(\"frame_\"+eA.id).Ç.height=pd.getElementsByTagName(\"html\")[0].clientHeight+\"px\";}if(eA.tab_browsing_area.Ç.display=='block'&&(!eA.isIE||eA.isIE >=8)){eA.tab_browsing_area.Ç.height=\"0px\";eA.tab_browsing_area.Ç.height=(eA.result.offsetTop-eA.tab_browsing_area.offsetTop-1)+\"px\";}height=d.body.offsetHeight-eA.get_all_toolbar_height()-4;eA.result.Ç.height=height+\"px\";width=d.body.offsetWidth-2;eA.result.Ç.width=width+\"px\";for(i=0;i < eA.inlinePopup.Æ;i++){popup=_$(eA.inlinePopup[i][\"popup_id\"]);maxLeft=d.body.offsetWidth-popup.offsetWidth;maxTop=d.body.offsetHeight-popup.offsetHeight;if(popup.offsetTop > maxTop)popup.Ç.top=maxTop+\"px\";if(popup.offsetLeft > maxLeft)popup.Ç.left=maxLeft+\"px\";}eA.manage_size(Ë);eA.fixLinesHeight(eA.Â.Ê,0,-1);}};EA.Ä.manage_size=Ã(onlyOneTime){if(!eAs[Á.id])return Ì;if(eAs[Á.id][\"displayed\"]==Ë&&Á.ÂFocused){var area_height,resized=Ì;if(!Á.Å['word_wrap']){var area_width=Á.Â.scrollWidth;area_height=Á.Â.scrollHeight;if(Á.isOpera&&Á.isOpera < 9.6){area_width=10000;}if(Á.Â.previous_scrollWidth!=area_width){Á.container.Ç.width=area_width+\"px\";Á.Â.Ç.width=area_width+\"px\";Á.content_highlight.Ç.width=area_width+\"px\";Á.Â.previous_scrollWidth=area_width;resized=Ë;}}if(Á.Å['word_wrap']){newW=Á.Â.offsetWidth;if(Á.isFirefox||Á.isIE)newW-=2;if(Á.isSafari)newW-=6;Á.content_highlight.Ç.width=Á.selection_field_text.Ç.width=Á.selection_field.Ç.width=Á.test_font_size.Ç.width=newW+\"px\";}if(Á.isOpera||Á.isFirefox||Á.isSafari){area_height=Á.getLinePosTop(Á.É[\"nb_line\"]+1);}\nelse{area_height=Á.Â.scrollHeight;}if(Á.Â.previous_scrollHeight!=area_height){Á.container.Ç.height=(area_height+2)+\"px\";Á.Â.Ç.height=area_height+\"px\";Á.content_highlight.Ç.height=area_height+\"px\";Á.Â.previous_scrollHeight=area_height;resized=Ë;}if(Á.É[\"nb_line\"] >=Á.line_number){var newLines='',destDiv=_$(\"line_number\"),start=Á.line_number,end=Á.É[\"nb_line\"]+100;for(i=start+1;i < end;i++){newLines+='<div id=\"line_'+i+'\">'+i+\"</div>\";Á.line_number++;}destDiv.innerHTML=destDiv.innerHTML+newLines;if(Á.Å['word_wrap']){Á.fixLinesHeight(Á.Â.Ê,start,-1);}}Á.Â.scrollTop=\"0px\";Á.Â.scrollLeft=\"0px\";if(resized==Ë){Á.scroll_to_view();}}if(!onlyOneTime)setTimeout(\"eA.manage_size();\",100);};EA.Ä.execCommand=Ã(cmd,param){for(var i in Á.plugins){if(typeof(Á.plugins[i].execCommand)==\"Ã\"){if(!Á.plugins[i].execCommand(cmd,param))return;}}switch(cmd){case \"save\":if(Á.Å[\"save_callback\"].Æ>0)eval(\"È.\"+Á.Å[\"save_callback\"]+\"('\"+Á.id+\"',eA.Â.Ê);\");break;case \"load\":if(Á.Å[\"load_callback\"].Æ>0)eval(\"È.\"+Á.Å[\"load_callback\"]+\"('\"+Á.id+\"');\");break;case \"onchange\":if(Á.Å[\"change_callback\"].Æ>0)eval(\"È.\"+Á.Å[\"change_callback\"]+\"('\"+Á.id+\"');\");break;case \"EA_load\":if(Á.Å[\"EA_load_callback\"].Æ>0)eval(\"È.\"+Á.Å[\"EA_load_callback\"]+\"('\"+Á.id+\"');\");break;case \"EA_unload\":if(Á.Å[\"EA_unload_callback\"].Æ>0)eval(\"È.\"+Á.Å[\"EA_unload_callback\"]+\"('\"+Á.id+\"');\");break;case \"toggle_on\":if(Á.Å[\"EA_toggle_on_callback\"].Æ>0)eval(\"È.\"+Á.Å[\"EA_toggle_on_callback\"]+\"('\"+Á.id+\"');\");break;case \"toggle_off\":if(Á.Å[\"EA_toggle_off_callback\"].Æ>0)eval(\"È.\"+Á.Å[\"EA_toggle_off_callback\"]+\"('\"+Á.id+\"');\");break;case \"re_sync\":if(!Á.do_highlight)break;case \"file_switch_on\":if(Á.Å[\"EA_file_switch_on_callback\"].Æ>0)eval(\"È.\"+Á.Å[\"EA_file_switch_on_callback\"]+\"(param);\");break;case \"file_switch_off\":if(Á.Å[\"EA_file_switch_off_callback\"].Æ>0)eval(\"È.\"+Á.Å[\"EA_file_switch_off_callback\"]+\"(param);\");break;case \"file_close\":if(Á.Å[\"EA_file_close_callback\"].Æ>0)return eval(\"È.\"+Á.Å[\"EA_file_close_callback\"]+\"(param);\");break;default:if(typeof(eval(\"eA.\"+cmd))==\"Ã\"){if(Á.Å[\"debug\"])eval(\"eA.\"+cmd+\"(param);\");\nelse try{eval(\"eA.\"+cmd+\"(param);\");}catch(e){};}}};EA.Ä.get_translation=Ã(word,mode){if(mode==\"template\")return È.eAL.translate(word,Á.Å[\"language\"],mode);\nelse return È.eAL.get_word_translation(word,Á.Å[\"language\"]);};EA.Ä.add_plugin=Ã(plug_name,plug_obj){for(var i=0;i<Á.Å[\"plugins\"].Æ;i++){if(Á.Å[\"plugins\"][i]==plug_name){Á.plugins[plug_name]=plug_obj;plug_obj.baseURL=È.eAL.baseURL+\"plugins/\"+plug_name+\"/\";if(typeof(plug_obj.init)==\"Ã\")plug_obj.init();}}};EA.Ä.load_css=Ã(url){try{link=document.createElement(\"link\");link.type=\"text/css\";link.rel=\"Çsheet\";link.media=\"all\";link.href=url;head=document.getElementsByTagName(\"head\");head[0].appendChild(link);}catch(e){document.write(\"<link href='\"+url+\"' rel='Çsheet' type='text/css' />\");}};EA.Ä.load_script=Ã(url){try{script=document.createElement(\"script\");script.type=\"text/javascript\";script.src=url;script.charset=\"UTF-8\";head=document.getElementsByTagName(\"head\");head[0].appendChild(script);}catch(e){document.write(\"<script type='text/javascript' src='\"+url+\"' charset=\\\"UTF-8\\\"><\"+\"/script>\");}};EA.Ä.add_lang=Ã(language,Ês){if(!È.eAL.lang[language])È.eAL.lang[language]={};for(var i in Ês)È.eAL.lang[language][i]=Ês[i];};Ã _$(id){return document.getElementById(id);};var eA=new EA();È.eAL.add_event(window,\"load\",init);Ã init(){setTimeout(\"eA.init();\",10);};	EA.Ä.focus=Ã(){Á.Â.focus();Á.ÂFocused=Ë;};EA.Ä.check_line_selection=Ã(timer_checkup){var changes,infos,new_top,new_width,i;var t1=t2=t2_1=t3=tLines=tend=new Date().getTime();if(!eAs[Á.id])return Ì;if(!Á.smooth_selection&&!Á.do_highlight){}\nelse if(Á.ÂFocused&&eAs[Á.id][\"displayed\"]==Ë&&Á.isResizing==Ì){infos=Á.get_selection_infos();changes=Á.checkTextEvolution(typeof(Á.É['full_text'])=='undefined' ? '':Á.É['full_text'],infos['full_text']);t2=new Date().getTime();if(Á.É[\"line_start\"] !=infos[\"line_start\"]||Á.É[\"line_nb\"] !=infos[\"line_nb\"]||infos[\"full_text\"] !=Á.É[\"full_text\"]||Á.reload_highlight||Á.É[\"selectionStart\"] !=infos[\"selectionStart\"]||Á.É[\"selectionEnd\"] !=infos[\"selectionEnd\"]||!timer_checkup){new_top=Á.getLinePosTop(infos[\"line_start\"]);new_width=Math.max(Á.Â.scrollWidth,Á.container.clientWidth-50);Á.selection_field.Ç.top=Á.selection_field_text.Ç.top=new_top+\"px\";if(!Á.Å['word_wrap']){Á.selection_field.Ç.width=Á.selection_field_text.Ç.width=Á.test_font_size.Ç.width=new_width+\"px\";}if(Á.do_highlight==Ë){var curr_text=infos[\"full_text\"].split(\"\\n\");var content=\"\";var start=Math.max(0,infos[\"line_start\"]-1);var end=Math.min(curr_text.Æ,infos[\"line_start\"]+infos[\"line_nb\"]-1);for(i=start;i< end;i++){content+=curr_text[i]+\"\\n\";}selLength=infos['selectionEnd']-infos['selectionStart'];content=content.substr(0,infos[\"curr_pos\"]-1)+\"\\r\\r\"+content.substr(infos[\"curr_pos\"]-1,selLength)+\"\\r\\r\"+content.substr(infos[\"curr_pos\"]-1+selLength);content='<span>'+content.replace(/&/g,\"&amp;\").replace(/</g,\"&lt;\").replace(/>/g,\"&gt;\").replace(\"\\r\\r\",'</span><strong>').replace(\"\\r\\r\",'</strong><span>')+'</span>';if(Á.isIE||(Á.isOpera&&Á.isOpera < 9.6)){Á.selection_field.innerHTML=\"<pre>\"+content.replace(/^\\r?\\n/,\"<br>\")+\"</pre>\";}\nelse{Á.selection_field.innerHTML=content;}Á.selection_field_text.innerHTML=Á.selection_field.innerHTML;t2_1=new Date().getTime();if(Á.reload_highlight||(infos[\"full_text\"] !=Á.last_text_to_highlight&&(Á.É[\"line_start\"]!=infos[\"line_start\"]||Á.show_line_colors||Á.Å['word_wrap']||Á.É[\"line_nb\"]!=infos[\"line_nb\"]||Á.É[\"nb_line\"]!=infos[\"nb_line\"]))){Á.maj_highlight(infos);}}}t3=new Date().getTime();if(Á.Å['word_wrap']&&infos[\"full_text\"] !=Á.É[\"full_text\"]){if(changes.newText.split(\"\\n\").Æ==1&&Á.É['nb_line']&&infos['nb_line']==Á.É['nb_line']){Á.fixLinesHeight(infos['full_text'],changes.lineStart,changes.lineStart);}\nelse{Á.fixLinesHeight(infos['full_text'],changes.lineStart,-1);}}tLines=new Date().getTime();if(infos[\"line_start\"] !=Á.É[\"line_start\"]||infos[\"curr_pos\"] !=Á.É[\"curr_pos\"]||infos[\"full_text\"].Æ!=Á.É[\"full_text\"].Æ||Á.reload_highlight||!timer_checkup){var selec_char=infos[\"curr_line\"].charAt(infos[\"curr_pos\"]-1);var no_real_move=Ë;if(infos[\"line_nb\"]==1&&(Á.assocBracket[selec_char]||Á.revertAssocBracket[selec_char])){no_real_move=Ì;if(Á.findEndBracket(infos,selec_char)===Ë){_$(\"end_bracket\").Ç.visibility=\"visible\";_$(\"cursor_pos\").Ç.visibility=\"visible\";_$(\"cursor_pos\").innerHTML=selec_char;_$(\"end_bracket\").innerHTML=(Á.assocBracket[selec_char]||Á.revertAssocBracket[selec_char]);}\nelse{_$(\"end_bracket\").Ç.visibility=\"hidden\";_$(\"cursor_pos\").Ç.visibility=\"hidden\";}}\nelse{_$(\"cursor_pos\").Ç.visibility=\"hidden\";_$(\"end_bracket\").Ç.visibility=\"hidden\";}Á.displayToCursorPosition(\"cursor_pos\",infos[\"line_start\"],infos[\"curr_pos\"]-1,infos[\"curr_line\"],no_real_move);if(infos[\"line_nb\"]==1&&infos[\"line_start\"]!=Á.É[\"line_start\"])Á.scroll_to_view();}Á.É=infos;}tend=new Date().getTime();if(timer_checkup){setTimeout(\"eA.check_line_selection(Ë)\",Á.check_line_selection_timer);}};EA.Ä.get_selection_infos=Ã(){var sel={},start,end,len,str;Á.getIESelection();start=Á.Â.selectionStart;end=Á.Â.selectionEnd;if(Á.É[\"selectionStart\"]==start&&Á.É[\"selectionEnd\"]==end&&Á.É[\"full_text\"]==Á.Â.Ê){return Á.É;}if(Á.tabulation!=\"\t\"&&Á.Â.Ê.indexOf(\"\t\")!=-1){len=Á.Â.Ê.Æ;Á.Â.Ê=Á.replace_tab(Á.Â.Ê);start=end=start+(Á.Â.Ê.Æ-len);Á.area_select(start,0);}sel[\"selectionStart\"]=start;sel[\"selectionEnd\"]=end;sel[\"full_text\"]=Á.Â.Ê;sel[\"line_start\"]=1;sel[\"line_nb\"]=1;sel[\"curr_pos\"]=0;sel[\"curr_line\"]=\"\";sel[\"indexOfCursor\"]=0;sel[\"selec_direction\"]=Á.É[\"selec_direction\"];var splitTab=sel[\"full_text\"].split(\"\\n\");var nbLine=Math.max(0,splitTab.Æ);var nbChar=Math.max(0,sel[\"full_text\"].Æ-(nbLine-1));if(sel[\"full_text\"].indexOf(\"\\r\")!=-1)nbChar=nbChar-(nbLine-1);sel[\"nb_line\"]=nbLine;sel[\"nb_char\"]=nbChar;if(start>0){str=sel[\"full_text\"].substr(0,start);sel[\"curr_pos\"]=start-str.lastIndexOf(\"\\n\");sel[\"line_start\"]=Math.max(1,str.split(\"\\n\").Æ);}\nelse{sel[\"curr_pos\"]=1;}if(end>start){sel[\"line_nb\"]=sel[\"full_text\"].substring(start,end).split(\"\\n\").Æ;}sel[\"indexOfCursor\"]=start;sel[\"curr_line\"]=splitTab[Math.max(0,sel[\"line_start\"]-1)];if(sel[\"selectionStart\"]==Á.É[\"selectionStart\"]){if(sel[\"selectionEnd\"]>Á.É[\"selectionEnd\"])sel[\"selec_direction\"]=\"down\";\nelse if(sel[\"selectionEnd\"]==Á.É[\"selectionStart\"])sel[\"selec_direction\"]=Á.É[\"selec_direction\"];}\nelse if(sel[\"selectionStart\"]==Á.É[\"selectionEnd\"]&&sel[\"selectionEnd\"]>Á.É[\"selectionEnd\"]){sel[\"selec_direction\"]=\"down\";}\nelse{sel[\"selec_direction\"]=\"up\";}_$(\"nbLine\").innerHTML=nbLine;_$(\"nbChar\").innerHTML=nbChar;_$(\"linePos\").innerHTML=sel[\"line_start\"];_$(\"currPos\").innerHTML=sel[\"curr_pos\"];return sel;};EA.Ä.getIESelection=Ã(){var selectionStart,selectionEnd,range,stored_range;if(!Á.isIE)return Ì;if(Á.Å['word_wrap'])Á.Â.wrap='off';try{range=document.selection.createRange();stored_range=range.duplicate();stored_range.moveToElementText(Á.Â);stored_range.setEndPoint('EndToEnd',range);if(stored_range.ÈElement()!=Á.Â)throw \"invalid focus\";var scrollTop=Á.result.scrollTop+document.body.scrollTop;var relative_top=range.offsetTop-È.calculeOffsetTop(Á.Â)+scrollTop;var line_start=Math.round((relative_top / Á.lineHeight)+1);var line_nb=Math.round(range.boundingHeight / Á.lineHeight);selectionStart=stored_range.text.Æ-range.text.Æ;selectionStart+=(line_start-Á.Â.Ê.substr(0,selectionStart).split(\"\\n\").Æ)*2;selectionStart-=(line_start-Á.Â.Ê.substr(0,selectionStart).split(\"\\n\").Æ)* 2;selectionEnd=selectionStart+range.text.Æ;selectionEnd+=(line_start+line_nb-1-Á.Â.Ê.substr(0,selectionEnd).split(\"\\n\").Æ)*2;Á.Â.selectionStart=selectionStart;Á.Â.selectionEnd=selectionEnd;}catch(e){}if(Á.Å['word_wrap'])Á.Â.wrap='soft';};EA.Ä.setIESelection=Ã(){var a=Á.Â,nbLineStart,nbLineEnd,range;if(!Á.isIE)return Ì;nbLineStart=a.Ê.substr(0,a.selectionStart).split(\"\\n\").Æ-1;nbLineEnd=a.Ê.substr(0,a.selectionEnd).split(\"\\n\").Æ-1;range=document.selection.createRange();range.moveToElementText(a);range.setEndPoint('EndToStart',range);range.moveStart('character',a.selectionStart-nbLineStart);range.moveEnd('character',a.selectionEnd-nbLineEnd-(a.selectionStart-nbLineStart));range.select();};EA.Ä.checkTextEvolution=Ã(lastText,newText){var ch={},baseStep=200,cpt=0,end,step,tStart=new Date().getTime();end=Math.min(newText.Æ,lastText.Æ);step=baseStep;while(cpt<end&&step>=1){if(lastText.substr(cpt,step)==newText.substr(cpt,step)){cpt+=step;}\nelse{step=Math.floor(step/2);}}ch.posStart=cpt;ch.lineStart=newText.substr(0,ch.posStart).split(\"\\n\").Æ-1;cpt_last=lastText.Æ;cpt=newText.Æ;step=baseStep;while(cpt>=0&&cpt_last>=0&&step>=1){if(lastText.substr(cpt_last-step,step)==newText.substr(cpt-step,step)){cpt-=step;cpt_last-=step;}\nelse{step=Math.floor(step/2);}}ch.posNewEnd=cpt;ch.posLastEnd=cpt_last;if(ch.posNewEnd<=ch.posStart){if(lastText.Æ < newText.Æ){ch.posNewEnd=ch.posStart+newText.Æ-lastText.Æ;ch.posLastEnd=ch.posStart;}\nelse{ch.posLastEnd=ch.posStart+lastText.Æ-newText.Æ;ch.posNewEnd=ch.posStart;}}ch.newText=newText.substring(ch.posStart,ch.posNewEnd);ch.lastText=lastText.substring(ch.posStart,ch.posLastEnd);ch.lineNewEnd=newText.substr(0,ch.posNewEnd).split(\"\\n\").Æ-1;ch.lineLastEnd=lastText.substr(0,ch.posLastEnd).split(\"\\n\").Æ-1;ch.newTextLine=newText.split(\"\\n\").slice(ch.lineStart,ch.lineNewEnd+1).join(\"\\n\");ch.lastTextLine=lastText.split(\"\\n\").slice(ch.lineStart,ch.lineLastEnd+1).join(\"\\n\");return ch;};EA.Ä.tab_selection=Ã(){if(Á.is_tabbing)return;Á.is_tabbing=Ë;Á.getIESelection();var start=Á.Â.selectionStart;var end=Á.Â.selectionEnd;var insText=Á.Â.Ê.substring(start,end);var pos_start=start;var pos_end=end;if(insText.Æ==0){Á.Â.Ê=Á.Â.Ê.substr(0,start)+Á.tabulation+Á.Â.Ê.substr(end);pos_start=start+Á.tabulation.Æ;pos_end=pos_start;}\nelse{start=Math.max(0,Á.Â.Ê.substr(0,start).lastIndexOf(\"\\n\")+1);endText=Á.Â.Ê.substr(end);startText=Á.Â.Ê.substr(0,start);tmp=Á.Â.Ê.substring(start,end).split(\"\\n\");insText=Á.tabulation+tmp.join(\"\\n\"+Á.tabulation);Á.Â.Ê=startText+insText+endText;pos_start=start;pos_end=Á.Â.Ê.indexOf(\"\\n\",startText.Æ+insText.Æ);if(pos_end==-1)pos_end=Á.Â.Ê.Æ;}Á.Â.selectionStart=pos_start;Á.Â.selectionEnd=pos_end;if(Á.isIE){Á.setIESelection();setTimeout(\"eA.is_tabbing=Ì;\",100);}\nelse{Á.is_tabbing=Ì;}};EA.Ä.invert_tab_selection=Ã(){var t=Á,a=Á.Â;if(t.is_tabbing)return;t.is_tabbing=Ë;t.getIESelection();var start=a.selectionStart;var end=a.selectionEnd;var insText=a.Ê.substring(start,end);var pos_start=start;var pos_end=end;if(insText.Æ==0){if(a.Ê.substring(start-t.tabulation.Æ,start)==t.tabulation){a.Ê=a.Ê.substr(0,start-t.tabulation.Æ)+a.Ê.substr(end);pos_start=Math.max(0,start-t.tabulation.Æ);pos_end=pos_start;}}\nelse{start=a.Ê.substr(0,start).lastIndexOf(\"\\n\")+1;endText=a.Ê.substr(end);startText=a.Ê.substr(0,start);tmp=a.Ê.substring(start,end).split(\"\\n\");insText=\"\";for(i=0;i<tmp.Æ;i++){for(j=0;j<t.tab_nb_char;j++){if(tmp[i].charAt(0)==\"\t\"){tmp[i]=tmp[i].substr(1);j=t.tab_nb_char;}\nelse if(tmp[i].charAt(0)==\" \")tmp[i]=tmp[i].substr(1);}insText+=tmp[i];if(i<tmp.Æ-1)insText+=\"\\n\";}a.Ê=startText+insText+endText;pos_start=start;pos_end=a.Ê.indexOf(\"\\n\",startText.Æ+insText.Æ);if(pos_end==-1)pos_end=a.Ê.Æ;}a.selectionStart=pos_start;a.selectionEnd=pos_end;if(t.isIE){t.setIESelection();setTimeout(\"eA.is_tabbing=Ì;\",100);}\nelse t.is_tabbing=Ì;};EA.Ä.press_enter=Ã(){if(!Á.smooth_selection)return Ì;Á.getIESelection();var scrollTop=Á.result.scrollTop;var scrollLeft=Á.result.scrollLeft;var start=Á.Â.selectionStart;var end=Á.Â.selectionEnd;var start_last_line=Math.max(0,Á.Â.Ê.substring(0,start).lastIndexOf(\"\\n\")+1);var begin_line=Á.Â.Ê.substring(start_last_line,start).replace(/^([ \t]*).*/gm,\"$1\");var lineStart=Á.Â.Ê.substring(0,start).split(\"\\n\").Æ;if(begin_line==\"\\n\"||begin_line==\"\\r\"||begin_line.Æ==0){return Ì;}if(Á.isIE||(Á.isOpera&&Á.isOpera < 9.6)){begin_line=\"\\r\\n\"+begin_line;}\nelse{begin_line=\"\\n\"+begin_line;}Á.Â.Ê=Á.Â.Ê.substring(0,start)+begin_line+Á.Â.Ê.substring(end);Á.area_select(start+begin_line.Æ,0);if(Á.isIE){Á.result.scrollTop=scrollTop;Á.result.scrollLeft=scrollLeft;}return Ë;};EA.Ä.findEndBracket=Ã(infos,bracket){var start=infos[\"indexOfCursor\"];var normal_order=Ë;if(Á.assocBracket[bracket])endBracket=Á.assocBracket[bracket];\nelse if(Á.revertAssocBracket[bracket]){endBracket=Á.revertAssocBracket[bracket];normal_order=Ì;}var end=-1;var nbBracketOpen=0;for(var i=start;i<infos[\"full_text\"].Æ&&i>=0;){if(infos[\"full_text\"].charAt(i)==endBracket){nbBracketOpen--;if(nbBracketOpen<=0){end=i;break;}}\nelse if(infos[\"full_text\"].charAt(i)==bracket)nbBracketOpen++;if(normal_order)i++;\nelse i--;}if(end==-1)return Ì;var endLastLine=infos[\"full_text\"].substr(0,end).lastIndexOf(\"\\n\");if(endLastLine==-1)line=1;\nelse line=infos[\"full_text\"].substr(0,endLastLine).split(\"\\n\").Æ+1;var curPos=end-endLastLine-1;var endLineLength=infos[\"full_text\"].substring(end).split(\"\\n\")[0].Æ;Á.displayToCursorPosition(\"end_bracket\",line,curPos,infos[\"full_text\"].substring(endLastLine+1,end+endLineLength));return Ë;};EA.Ä.displayToCursorPosition=Ã(id,start_line,cur_pos,lineContent,no_real_move){var elem,dest,content,posLeft=0,posTop,fixPadding,topOffset,endElem;elem=Á.test_font_size;dest=_$(id);content=\"<span id='test_font_size_inner'>\"+lineContent.substr(0,cur_pos).replace(/&/g,\"&amp;\").replace(/</g,\"&lt;\")+\"</span><span id='endTestFont'>\"+lineContent.substr(cur_pos).replace(/&/g,\"&amp;\").replace(/</g,\"&lt;\")+\"</span>\";if(Á.isIE||(Á.isOpera&&Á.isOpera < 9.6)){elem.innerHTML=\"<pre>\"+content.replace(/^\\r?\\n/,\"<br>\")+\"</pre>\";}\nelse{elem.innerHTML=content;}endElem=_$('endTestFont');topOffset=endElem.offsetTop;fixPadding=parseInt(Á.content_highlight.Ç.paddingLeft.replace(\"px\",\"\"));posLeft=45+endElem.offsetLeft+(!isNaN(fixPadding)&&topOffset > 0 ? fixPadding:0);posTop=Á.getLinePosTop(start_line)+topOffset;if(Á.isIE&&cur_pos > 0&&endElem.offsetLeft==0){posTop+=Á.lineHeight;}if(no_real_move!=Ë){dest.Ç.top=posTop+\"px\";dest.Ç.left=posLeft+\"px\";}dest.cursor_top=posTop;dest.cursor_left=posLeft;};EA.Ä.getLinePosTop=Ã(start_line){var elem=_$('line_'+start_line),posTop=0;if(elem)posTop=elem.offsetTop;\nelse posTop=Á.lineHeight *(start_line-1);return posTop;};EA.Ä.getTextHeight=Ã(text){var t=Á,elem,height;elem=t.test_font_size;content=text.replace(/&/g,\"&amp;\").replace(/</g,\"&lt;\");if(t.isIE||(Á.isOpera&&Á.isOpera < 9.6)){elem.innerHTML=\"<pre>\"+content.replace(/^\\r?\\n/,\"<br>\")+\"</pre>\";}\nelse{elem.innerHTML=content;}height=elem.offsetHeight;height=Math.max(1,Math.floor(elem.offsetHeight / Á.lineHeight))* Á.lineHeight;return height;};EA.Ä.fixLinesHeight=Ã(textValue,lineStart,lineEnd){var aText=textValue.split(\"\\n\");if(lineEnd==-1)lineEnd=aText.Æ-1;for(var i=Math.max(0,lineStart);i <=lineEnd;i++){if(elem=_$('line_'+(i+1))){elem.Ç.height=typeof(aText[i])!=\"undefined\" ? Á.getTextHeight(aText[i])+\"px\":Á.lineHeight;}}};EA.Ä.area_select=Ã(start,Æ){Á.Â.focus();start=Math.max(0,Math.min(Á.Â.Ê.Æ,start));end=Math.max(start,Math.min(Á.Â.Ê.Æ,start+Æ));if(Á.isIE){Á.Â.selectionStart=start;Á.Â.selectionEnd=end;Á.setIESelection();}\nelse{if(Á.isOpera&&Á.isOpera < 9.6){Á.Â.setSelectionRange(0,0);}Á.Â.setSelectionRange(start,end);}Á.check_line_selection();};EA.Ä.area_get_selection=Ã(){var text=\"\";if(document.selection){var range=document.selection.createRange();text=range.text;}\nelse{text=Á.Â.Ê.substring(Á.Â.selectionStart,Á.Â.selectionEnd);}return text;}; EA.Ä.replace_tab=Ã(text){return text.replace(/((\\n?)([^\t\\n]*)\t)/gi,eA.smartTab);};EA.Ä.smartTab=Ã(){val=\"                   \";return EA.Ä.smartTab.arguments[2]+EA.Ä.smartTab.arguments[3]+val.substr(0,eA.tab_nb_char-(EA.Ä.smartTab.arguments[3].Æ)%eA.tab_nb_char);};EA.Ä.show_waiting_screen=Ã(){width=Á.editor_area.offsetWidth;height=Á.editor_area.offsetHeight;if(!(Á.isIE&&Á.isIE<6)){width-=2;height-=2;}Á.processing_screen.Ç.display=\"block\";Á.processing_screen.Ç.width=width+\"px\";Á.processing_screen.Ç.height=height+\"px\";Á.waiting_screen_displayed=Ë;};EA.Ä.hide_waiting_screen=Ã(){Á.processing_screen.Ç.display=\"none\";Á.waiting_screen_displayed=Ì;};EA.Ä.add_Ç=Ã(Çs){if(Çs.Æ>0){newcss=document.createElement(\"Ç\");newcss.type=\"text/css\";newcss.media=\"all\";if(newcss.ÇSheet){newcss.ÇSheet.cssText=Çs;}\nelse{newcss.appendChild(document.createTextNode(Çs));}document.getElementsByTagName(\"head\")[0].appendChild(newcss);}};EA.Ä.set_font=Ã(family,size){var t=Á,a=Á.Â,s=Á.Å,elem_font,i,elem;var elems=[\"Â\",\"content_highlight\",\"cursor_pos\",\"end_bracket\",\"selection_field\",\"selection_field_text\",\"line_number\"];if(family&&family!=\"\")s[\"font_family\"]=family;if(size&&size>0)s[\"font_size\"]=size;if(t.isOpera&&t.isOpera < 9.6)s['font_family']=\"monospace\";if(elem_font=_$(\"area_font_size\")){for(i=0;i < elem_font.Æ;i++){if(elem_font.options[i].Ê&&elem_font.options[i].Ê==s[\"font_size\"])elem_font.options[i].selected=Ë;}}if(t.isFirefox){var nbTry=3;do{var div1=document.createElement('div'),text1=document.createElement('Â');var Çs={width:'40px',overflow:'scroll',zIndex:50,visibility:'hidden',fontFamily:s[\"font_family\"],fontSize:s[\"font_size\"]+\"pt\",lineHeight:t.lineHeight+\"px\",padding:'0',margin:'0',border:'none',whiteSpace:'nowrap'};var diff,changed=Ì;for(i in Çs){div1.Ç[ i ]=Çs[i];text1.Ç[ i ]=Çs[i];}text1.wrap='off';text1.setAttribute('wrap','off');t.container.appendChild(div1);t.container.appendChild(text1);div1.innerHTML=text1.Ê='azertyuiopqsdfghjklm';div1.innerHTML=text1.Ê=text1.Ê+'wxcvbn^p*ù$!:;,,';diff=text1.scrollWidth-div1.scrollWidth;if(Math.abs(diff)>=2){s[\"font_size\"]++;changed=Ë;}t.container.removeChild(div1);t.container.removeChild(text1);nbTry--;}while(changed&&nbTry > 0);}elem=t.test_font_size;elem.Ç.fontFamily=\"\"+s[\"font_family\"];elem.Ç.fontSize=s[\"font_size\"]+\"pt\";elem.innerHTML=\"0\";t.lineHeight=elem.offsetHeight;for(i=0;i<elems.Æ;i++){elem=_$(elems[i]);elem.Ç.fontFamily=s[\"font_family\"];elem.Ç.fontSize=s[\"font_size\"]+\"pt\";elem.Ç.lineHeight=t.lineHeight+\"px\";}t.add_Ç(\"pre{font-family:\"+s[\"font_family\"]+\"}\");if((t.isOpera&&t.isOpera < 9.6)||t.isIE >=8){var parNod=a.ÈNode,nxtSib=a.nextSibling,start=a.selectionStart,end=a.selectionEnd;parNod.removeChild(a);parNod.insertBefore(a,nxtSib);t.area_select(start,end-start);}Á.focus();Á.update_size();Á.check_line_selection();};EA.Ä.change_font_size=Ã(){var size=_$(\"area_font_size\").Ê;if(size>0)Á.set_font(\"\",size);};EA.Ä.open_inline_popup=Ã(popup_id){Á.close_all_inline_popup();var popup=_$(popup_id);var editor=_$(\"editor\");for(var i=0;i<Á.inlinePopup.Æ;i++){if(Á.inlinePopup[i][\"popup_id\"]==popup_id){var icon=_$(Á.inlinePopup[i][\"icon_id\"]);if(icon){Á.switchClassSticky(icon,'editAreaButtonSelected',Ë);break;}}}popup.Ç.height=\"auto\";popup.Ç.overflow=\"visible\";if(document.body.offsetHeight< popup.offsetHeight){popup.Ç.height=(document.body.offsetHeight-10)+\"px\";popup.Ç.overflow=\"auto\";}if(!popup.positionned){var new_left=editor.offsetWidth /2-popup.offsetWidth /2;var new_top=editor.offsetHeight /2-popup.offsetHeight /2;popup.Ç.left=new_left+\"px\";popup.Ç.top=new_top+\"px\";popup.positionned=Ë;}popup.Ç.visibility=\"visible\";};EA.Ä.close_inline_popup=Ã(popup_id){var popup=_$(popup_id);for(var i=0;i<Á.inlinePopup.Æ;i++){if(Á.inlinePopup[i][\"popup_id\"]==popup_id){var icon=_$(Á.inlinePopup[i][\"icon_id\"]);if(icon){Á.switchClassSticky(icon,'editAreaButtonNormal',Ì);break;}}}popup.Ç.visibility=\"hidden\";};EA.Ä.close_all_inline_popup=Ã(e){for(var i=0;i<Á.inlinePopup.Æ;i++){Á.close_inline_popup(Á.inlinePopup[i][\"popup_id\"]);}Á.Â.focus();};EA.Ä.show_help=Ã(){Á.open_inline_popup(\"edit_area_help\");};EA.Ä.new_document=Ã(){Á.Â.Ê=\"\";Á.area_select(0,0);};EA.Ä.get_all_toolbar_height=Ã(){var area=_$(\"editor\");var results=È.getChildren(area,\"div\",\"class\",\"area_toolbar\",\"all\",\"0\");var height=0;for(var i=0;i<results.Æ;i++){height+=results[i].offsetHeight;}return height;};EA.Ä.go_to_line=Ã(line){if(!line){var icon=_$(\"go_to_line\");if(icon !=null){Á.restoreClass(icon);Á.switchClassSticky(icon,'editAreaButtonSelected',Ë);}line=prompt(Á.get_translation(\"go_to_line_prompt\"));if(icon !=null)Á.switchClassSticky(icon,'editAreaButtonNormal',Ì);}if(line&&line!=null&&line.search(/^[0-9]+$/)!=-1){var start=0;var lines=Á.Â.Ê.split(\"\\n\");if(line > lines.Æ)start=Á.Â.Ê.Æ;\nelse{for(var i=0;i<Math.min(line-1,lines.Æ);i++)start+=lines[i].Æ+1;}Á.area_select(start,0);}};EA.Ä.change_smooth_selection_mode=Ã(setTo){if(Á.do_highlight)return;if(setTo !=null){if(setTo===Ì)Á.smooth_selection=Ë;\nelse Á.smooth_selection=Ì;}var icon=_$(\"change_smooth_selection\");Á.Â.focus();if(Á.smooth_selection===Ë){Á.switchClassSticky(icon,'editAreaButtonNormal',Ì);Á.smooth_selection=Ì;Á.selection_field.Ç.display=\"none\";_$(\"cursor_pos\").Ç.display=\"none\";_$(\"end_bracket\").Ç.display=\"none\";}\nelse{Á.switchClassSticky(icon,'editAreaButtonSelected',Ì);Á.smooth_selection=Ë;Á.selection_field.Ç.display=\"block\";_$(\"cursor_pos\").Ç.display=\"block\";_$(\"end_bracket\").Ç.display=\"block\";}};EA.Ä.scroll_to_view=Ã(show){var zone,lineElem;if(!Á.smooth_selection)return;zone=_$(\"result\");var cursor_pos_top=_$(\"cursor_pos\").cursor_top;if(show==\"bottom\"){cursor_pos_top+=Á.getLinePosTop(Á.É['line_start']+Á.É['line_nb']-1);}var max_height_visible=zone.clientHeight+zone.scrollTop;var miss_top=cursor_pos_top+Á.lineHeight-max_height_visible;if(miss_top>0){zone.scrollTop=zone.scrollTop+miss_top;}\nelse if(zone.scrollTop > cursor_pos_top){zone.scrollTop=cursor_pos_top;}var cursor_pos_left=_$(\"cursor_pos\").cursor_left;var max_width_visible=zone.clientWidth+zone.scrollLeft;var miss_left=cursor_pos_left+10-max_width_visible;if(miss_left>0){zone.scrollLeft=zone.scrollLeft+miss_left+50;}\nelse if(zone.scrollLeft > cursor_pos_left){zone.scrollLeft=cursor_pos_left;}\nelse if(zone.scrollLeft==45){zone.scrollLeft=0;}};EA.Ä.check_undo=Ã(only_once){if(!eAs[Á.id])return Ì;if(Á.ÂFocused&&eAs[Á.id][\"displayed\"]==Ë){var text=Á.Â.Ê;if(Á.previous.Æ<=1)Á.switchClassSticky(_$(\"undo\"),'editAreaButtonDisabled',Ë);if(!Á.previous[Á.previous.Æ-1]||Á.previous[Á.previous.Æ-1][\"text\"] !=text){Á.previous.push({\"text\":text,\"selStart\":Á.Â.selectionStart,\"selEnd\":Á.Â.selectionEnd});if(Á.previous.Æ > Á.Å[\"max_undo\"]+1)Á.previous.shift();}if(Á.previous.Æ >=2)Á.switchClassSticky(_$(\"undo\"),'editAreaButtonNormal',Ì);}if(!only_once)setTimeout(\"eA.check_undo()\",3000);};EA.Ä.undo=Ã(){if(Á.previous.Æ > 0){Á.getIESelection();Á.next.push({\"text\":Á.Â.Ê,\"selStart\":Á.Â.selectionStart,\"selEnd\":Á.Â.selectionEnd});var prev=Á.previous.pop();if(prev[\"text\"]==Á.Â.Ê&&Á.previous.Æ > 0)prev=Á.previous.pop();Á.Â.Ê=prev[\"text\"];Á.last_undo=prev[\"text\"];Á.area_select(prev[\"selStart\"],prev[\"selEnd\"]-prev[\"selStart\"]);Á.switchClassSticky(_$(\"redo\"),'editAreaButtonNormal',Ì);Á.resync_highlight(Ë);Á.check_file_changes();}};EA.Ä.redo=Ã(){if(Á.next.Æ > 0){var next=Á.next.pop();Á.previous.push(next);Á.Â.Ê=next[\"text\"];Á.last_undo=next[\"text\"];Á.area_select(next[\"selStart\"],next[\"selEnd\"]-next[\"selStart\"]);Á.switchClassSticky(_$(\"undo\"),'editAreaButtonNormal',Ì);Á.resync_highlight(Ë);Á.check_file_changes();}if(Á.next.Æ==0)Á.switchClassSticky(_$(\"redo\"),'editAreaButtonDisabled',Ë);};EA.Ä.check_redo=Ã(){if(eA.next.Æ==0||eA.Â.Ê!=eA.last_undo){eA.next=[];eA.switchClassSticky(_$(\"redo\"),'editAreaButtonDisabled',Ë);}\nelse{Á.switchClassSticky(_$(\"redo\"),'editAreaButtonNormal',Ì);}};EA.Ä.switchClass=Ã(element,class_name,lock_state){var lockChanged=Ì;if(typeof(lock_state)!=\"undefined\"&&element !=null){element.classLock=lock_state;lockChanged=Ë;}if(element !=null&&(lockChanged||!element.classLock)){element.oldClassName=element.className;element.className=class_name;}};EA.Ä.restoreAndSwitchClass=Ã(element,class_name){if(element !=null&&!element.classLock){Á.restoreClass(element);Á.switchClass(element,class_name);}};EA.Ä.restoreClass=Ã(element){if(element !=null&&element.oldClassName&&!element.classLock){element.className=element.oldClassName;element.oldClassName=null;}};EA.Ä.setClassLock=Ã(element,lock_state){if(element !=null)element.classLock=lock_state;};EA.Ä.switchClassSticky=Ã(element,class_name,lock_state){var lockChanged=Ì;if(typeof(lock_state)!=\"undefined\"&&element !=null){element.classLock=lock_state;lockChanged=Ë;}if(element !=null&&(lockChanged||!element.classLock)){element.className=class_name;element.oldClassName=class_name;}};EA.Ä.scroll_page=Ã(params){var dir=params[\"dir\"],shift_pressed=params[\"shift\"];var lines=Á.Â.Ê.split(\"\\n\");var new_pos=0,Æ=0,char_left=0,line_nb=0,curLine=0;var toScrollAmount=_$(\"result\").clientHeight-30;var nbLineToScroll=0,diff=0;if(dir==\"up\"){nbLineToScroll=Math.ceil(toScrollAmount / Á.lineHeight);for(i=Á.É[\"line_start\"];i-diff > Á.É[\"line_start\"]-nbLineToScroll;i--){if(elem=_$('line_'+i)){diff+=Math.floor((elem.offsetHeight-1)/ Á.lineHeight);}}nbLineToScroll-=diff;if(Á.É[\"selec_direction\"]==\"up\"){for(line_nb=0;line_nb< Math.min(Á.É[\"line_start\"]-nbLineToScroll,lines.Æ);line_nb++){new_pos+=lines[line_nb].Æ+1;}char_left=Math.min(lines[Math.min(lines.Æ-1,line_nb)].Æ,Á.É[\"curr_pos\"]-1);if(shift_pressed)Æ=Á.É[\"selectionEnd\"]-new_pos-char_left;Á.area_select(new_pos+char_left,Æ);view=\"top\";}\nelse{view=\"bottom\";for(line_nb=0;line_nb< Math.min(Á.É[\"line_start\"]+Á.É[\"line_nb\"]-1-nbLineToScroll,lines.Æ);line_nb++){new_pos+=lines[line_nb].Æ+1;}char_left=Math.min(lines[Math.min(lines.Æ-1,line_nb)].Æ,Á.É[\"curr_pos\"]-1);if(shift_pressed){start=Math.min(Á.É[\"selectionStart\"],new_pos+char_left);Æ=Math.max(new_pos+char_left,Á.É[\"selectionStart\"])-start;if(new_pos+char_left < Á.É[\"selectionStart\"])view=\"top\";}\nelse start=new_pos+char_left;Á.area_select(start,Æ);}}\nelse{var nbLineToScroll=Math.floor(toScrollAmount / Á.lineHeight);for(i=Á.É[\"line_start\"];i+diff < Á.É[\"line_start\"]+nbLineToScroll;i++){if(elem=_$('line_'+i)){diff+=Math.floor((elem.offsetHeight-1)/ Á.lineHeight);}}nbLineToScroll-=diff;if(Á.É[\"selec_direction\"]==\"down\"){view=\"bottom\";for(line_nb=0;line_nb< Math.min(Á.É[\"line_start\"]+Á.É[\"line_nb\"]-2+nbLineToScroll,lines.Æ);line_nb++){if(line_nb==Á.É[\"line_start\"]-1)char_left=Á.É[\"selectionStart\"]-new_pos;new_pos+=lines[line_nb].Æ+1;}if(shift_pressed){Æ=Math.abs(Á.É[\"selectionStart\"]-new_pos);Æ+=Math.min(lines[Math.min(lines.Æ-1,line_nb)].Æ,Á.É[\"curr_pos\"]);Á.area_select(Math.min(Á.É[\"selectionStart\"],new_pos),Æ);}\nelse{Á.area_select(new_pos+char_left,0);}}\nelse{view=\"top\";for(line_nb=0;line_nb< Math.min(Á.É[\"line_start\"]+nbLineToScroll-1,lines.Æ,lines.Æ);line_nb++){if(line_nb==Á.É[\"line_start\"]-1)char_left=Á.É[\"selectionStart\"]-new_pos;new_pos+=lines[line_nb].Æ+1;}if(shift_pressed){Æ=Math.abs(Á.É[\"selectionEnd\"]-new_pos-char_left);Æ+=Math.min(lines[Math.min(lines.Æ-1,line_nb)].Æ,Á.É[\"curr_pos\"])-char_left-1;Á.area_select(Math.min(Á.É[\"selectionEnd\"],new_pos+char_left),Æ);if(new_pos+char_left > Á.É[\"selectionEnd\"])view=\"bottom\";}\nelse{Á.area_select(new_pos+char_left,0);}}}Á.check_line_selection();Á.scroll_to_view(view);};EA.Ä.start_resize=Ã(e){È.eAL.resize[\"id\"]=eA.id;È.eAL.resize[\"start_x\"]=(e)? e.pageX:event.x+document.body.scrollLeft;È.eAL.resize[\"start_y\"]=(e)? e.pageY:event.y+document.body.scrollTop;if(eA.isIE){eA.Â.focus();eA.getIESelection();}È.eAL.resize[\"selectionStart\"]=eA.Â.selectionStart;È.eAL.resize[\"selectionEnd\"]=eA.Â.selectionEnd;È.eAL.start_resize_area();};EA.Ä.toggle_full_screen=Ã(to){var t=Á,p=È,a=t.Â,html,frame,selStart,selEnd,old,icon;if(typeof(to)==\"undefined\")to=!t.fullscreen['isFull'];old=t.fullscreen['isFull'];t.fullscreen['isFull']=to;icon=_$(\"fullscreen\");selStart=t.Â.selectionStart;selEnd=t.Â.selectionEnd;html=p.document.getElementsByTagName(\"html\")[0];frame=p.document.getElementById(\"frame_\"+t.id);if(to&&to!=old){t.fullscreen['old_overflow']=p.get_css_property(html,\"overflow\");t.fullscreen['old_height']=p.get_css_property(html,\"height\");t.fullscreen['old_width']=p.get_css_property(html,\"width\");t.fullscreen['old_scrollTop']=html.scrollTop;t.fullscreen['old_scrollLeft']=html.scrollLeft;t.fullscreen['old_zIndex']=p.get_css_property(frame,\"z-index\");if(t.isOpera){html.Ç.height=\"100%\";html.Ç.width=\"100%\";}html.Ç.overflow=\"hidden\";html.scrollTop=0;html.scrollLeft=0;frame.Ç.position=\"absolute\";frame.Ç.width=html.clientWidth+\"px\";frame.Ç.height=html.clientHeight+\"px\";frame.Ç.display=\"block\";frame.Ç.zIndex=\"999999\";frame.Ç.top=\"0px\";frame.Ç.left=\"0px\";frame.Ç.top=\"-\"+p.calculeOffsetTop(frame)+\"px\";frame.Ç.left=\"-\"+p.calculeOffsetLeft(frame)+\"px\";t.switchClassSticky(icon,'editAreaButtonSelected',Ì);t.fullscreen['allow_resize']=t.resize_allowed;t.allow_resize(Ì);if(t.isFirefox){p.eAL.execCommand(t.id,\"update_size();\");t.area_select(selStart,selEnd-selStart);t.scroll_to_view();t.focus();}\nelse{setTimeout(\"È.eAL.execCommand('\"+t.id+\"','update_size();');eA.focus();\",10);}}\nelse if(to!=old){frame.Ç.position=\"static\";frame.Ç.zIndex=t.fullscreen['old_zIndex'];if(t.isOpera){html.Ç.height=\"auto\";html.Ç.width=\"auto\";html.Ç.overflow=\"auto\";}\nelse if(t.isIE&&p!=top){html.Ç.overflow=\"auto\";}\nelse{html.Ç.overflow=t.fullscreen['old_overflow'];}html.scrollTop=t.fullscreen['old_scrollTop'];html.scrollLeft=t.fullscreen['old_scrollLeft'];p.eAL.hide(t.id);p.eAL.show(t.id);t.switchClassSticky(icon,'editAreaButtonNormal',Ì);if(t.fullscreen['allow_resize'])t.allow_resize(t.fullscreen['allow_resize']);if(t.isFirefox){t.area_select(selStart,selEnd-selStart);setTimeout(\"eA.scroll_to_view();\",10);}}};EA.Ä.allow_resize=Ã(allow){var resize=_$(\"resize_area\");if(allow){resize.Ç.visibility=\"visible\";È.eAL.add_event(resize,\"mouseup\",eA.start_resize);}\nelse{resize.Ç.visibility=\"hidden\";È.eAL.remove_event(resize,\"mouseup\",eA.start_resize);}Á.resize_allowed=allow;};EA.Ä.change_syntax=Ã(new_syntax,is_waiting){if(new_syntax==Á.Å['syntax'])return Ë;var founded=Ì;for(var i=0;i<Á.syntax_list.Æ;i++){if(Á.syntax_list[i]==new_syntax)founded=Ë;}if(founded==Ë){if(!È.eAL.load_syntax[new_syntax]){if(!is_waiting)È.eAL.load_script(È.eAL.baseURL+\"reg_syntax/\"+new_syntax+\".js\");setTimeout(\"eA.change_syntax('\"+new_syntax+\"',Ë);\",100);Á.show_waiting_screen();}\nelse{if(!Á.allready_used_syntax[new_syntax]){È.eAL.init_syntax_regexp();Á.add_Ç(È.eAL.syntax[new_syntax][\"Çs\"]);Á.allready_used_syntax[new_syntax]=Ë;}var sel=_$(\"syntax_selection\");if(sel&&sel.Ê!=new_syntax){for(var i=0;i<sel.Æ;i++){if(sel.options[i].Ê&&sel.options[i].Ê==new_syntax)sel.options[i].selected=Ë;}}Á.Å['syntax']=new_syntax;Á.resync_highlight(Ë);Á.hide_waiting_screen();return Ë;}}return Ì;};EA.Ä.set_editable=Ã(is_editable){if(is_editable){document.body.className=\"\";Á.Â.readOnly=Ì;Á.is_editable=Ë;}\nelse{document.body.className=\"non_editable\";Á.Â.readOnly=Ë;Á.is_editable=Ì;}if(eAs[Á.id][\"displayed\"]==Ë)Á.update_size();};EA.Ä.toggle_word_wrap=Ã(){Á.set_word_wrap(!Á.Å['word_wrap']);};EA.Ä.set_word_wrap=Ã(to){var t=Á,a=t.Â;if(t.isOpera&&t.isOpera < 9.8){Á.Å['word_wrap']=Ì;t.switchClassSticky(_$(\"word_wrap\"),'editAreaButtonDisabled',Ë);return Ì;}if(to){wrap_mode='soft';Á.container.className+=' word_wrap';Á.container.Ç.width=\"\";Á.content_highlight.Ç.width=\"\";a.Ç.width=\"100%\";if(t.isIE&&t.isIE < 7){a.Ç.width=(a.offsetWidth-5)+\"px\";}t.switchClassSticky(_$(\"word_wrap\"),'editAreaButtonSelected',Ì);}\nelse{wrap_mode='off';Á.container.className=Á.container.className.replace(/word_wrap/g,'');t.switchClassSticky(_$(\"word_wrap\"),'editAreaButtonNormal',Ë);}Á.Â.previous_scrollWidth='';Á.Â.previous_scrollHeight='';a.wrap=wrap_mode;a.setAttribute('wrap',wrap_mode);if(!Á.isIE){var start=a.selectionStart,end=a.selectionEnd;var parNod=a.ÈNode,nxtSib=a.nextSibling;parNod.removeChild(a);parNod.insertBefore(a,nxtSib);Á.area_select(start,end-start);}Á.Å['word_wrap']=to;Á.focus();Á.update_size();Á.check_line_selection();};EA.Ä.open_file=Ã(Å){if(Å['id']!=\"undefined\"){var id=Å['id'];var new_file={};new_file['id']=id;new_file['title']=id;new_file['text']=\"\";new_file['É']=\"\";new_file['last_text_to_highlight']=\"\";new_file['last_hightlighted_text']=\"\";new_file['previous']=[];new_file['next']=[];new_file['last_undo']=\"\";new_file['smooth_selection']=Á.Å['smooth_selection'];new_file['do_highlight']=Á.Å['start_highlight'];new_file['syntax']=Á.Å['syntax'];new_file['scroll_top']=0;new_file['scroll_left']=0;new_file['selection_start']=0;new_file['selection_end']=0;new_file['edited']=Ì;new_file['font_size']=Á.Å[\"font_size\"];new_file['font_family']=Á.Å[\"font_family\"];new_file['word_wrap']=Á.Å[\"word_wrap\"];new_file['toolbar']={'links':{},'selects':{}};new_file['compare_edited_text']=new_file['text'];Á.files[id]=new_file;Á.update_file(id,Å);Á.files[id]['compare_edited_text']=Á.files[id]['text'];var html_id='tab_file_'+encodeURIComponent(id);Á.filesIdAssoc[html_id]=id;Á.files[id]['html_id']=html_id;if(!_$(Á.files[id]['html_id'])&&id!=\"\"){Á.tab_browsing_area.Ç.display=\"block\";var elem=document.createElement('li');elem.id=Á.files[id]['html_id'];var close=\"<img src=\\\"\"+È.eAL.baseURL+\"images/close.gif\\\" title=\\\"\"+Á.get_translation('close_tab','word')+\"\\\" onclick=\\\"eA.execCommand('close_file',eA.filesIdAssoc['\"+html_id+\"']);return Ì;\\\" class=\\\"hidden\\\" onmouseover=\\\"Á.className=''\\\" onmouseout=\\\"Á.className='hidden'\\\" />\";elem.innerHTML=\"<a onclick=\\\"javascript:eA.execCommand('switch_to_file',eA.filesIdAssoc['\"+html_id+\"']);\\\" selec=\\\"none\\\"><b><span><strong class=\\\"edited\\\">*</strong>\"+Á.files[id]['title']+close+\"</span></b></a>\";_$('tab_browsing_list').appendChild(elem);var elem=document.createElement('text');Á.update_size();}if(id!=\"\")Á.execCommand('file_open',Á.files[id]);Á.switch_to_file(id,Ë);return Ë;}\nelse return Ì;};EA.Ä.close_file=Ã(id){if(Á.files[id]){Á.save_file(id);if(Á.execCommand('file_close',Á.files[id])!==Ì){var li=_$(Á.files[id]['html_id']);li.ÈNode.removeChild(li);if(id==Á.curr_file){var next_file=\"\";var is_next=Ì;for(var i in Á.files){if(is_next){next_file=i;break;}\nelse if(i==id)is_next=Ë;\nelse next_file=i;}Á.switch_to_file(next_file);}delete(Á.files[id]);Á.update_size();}}};EA.Ä.save_file=Ã(id){var t=Á,save,a_links,a_selects,save_butt,img,i;if(t.files[id]){var save=t.files[id];save['É']=t.É;save['last_text_to_highlight']=t.last_text_to_highlight;save['last_hightlighted_text']=t.last_hightlighted_text;save['previous']=t.previous;save['next']=t.next;save['last_undo']=t.last_undo;save['smooth_selection']=t.smooth_selection;save['do_highlight']=t.do_highlight;save['syntax']=t.Å['syntax'];save['text']=t.Â.Ê;save['scroll_top']=t.result.scrollTop;save['scroll_left']=t.result.scrollLeft;save['selection_start']=t.É[\"selectionStart\"];save['selection_end']=t.É[\"selectionEnd\"];save['font_size']=t.Å[\"font_size\"];save['font_family']=t.Å[\"font_family\"];save['word_wrap']=t.Å[\"word_wrap\"];save['toolbar']={'links':{},'selects':{}};a_links=_$(\"toolbar_1\").getElementsByTagName(\"a\");for(i=0;i<a_links.Æ;i++){if(a_links[i].getAttribute('fileSpecific')=='yes'){save_butt={};img=a_links[i].getElementsByTagName('img')[0];save_butt['classLock']=img.classLock;save_butt['className']=img.className;save_butt['oldClassName']=img.oldClassName;save['toolbar']['links'][a_links[i].id]=save_butt;}}a_selects=_$(\"toolbar_1\").getElementsByTagName(\"select\");for(i=0;i<a_selects.Æ;i++){if(a_selects[i].getAttribute('fileSpecific')=='yes'){save['toolbar']['selects'][a_selects[i].id]=a_selects[i].Ê;}}t.files[id]=save;return save;}return Ì;};EA.Ä.update_file=Ã(id,new_Ês){for(var i in new_Ês){Á.files[id][i]=new_Ês[i];}};EA.Ä.display_file=Ã(id){var t=Á,a=t.Â,new_file,a_lis,a_selects,a_links,a_options,i,j;if(id==''){a.readOnly=Ë;t.tab_browsing_area.Ç.display=\"none\";_$(\"no_file_selected\").Ç.display=\"block\";t.result.className=\"empty\";if(!t.files['']){t.open_file({id:''});}}\nelse if(typeof(t.files[id])=='undefined'){return Ì;}\nelse{t.result.className=\"\";a.readOnly=!t.is_editable;_$(\"no_file_selected\").Ç.display=\"none\";t.tab_browsing_area.Ç.display=\"block\";}t.check_redo(Ë);t.check_undo(Ë);t.curr_file=id;a_lis=t.tab_browsing_area.getElementsByTagName('li');for(i=0;i<a_lis.Æ;i++){if(a_lis[i].id==t.files[id]['html_id'])a_lis[i].className='selected';\nelse a_lis[i].className='';}new_file=t.files[id];a.Ê=new_file['text'];t.set_font(new_file['font_family'],new_file['font_size']);t.area_select(new_file['selection_start'],new_file['selection_end']-new_file['selection_start']);t.manage_size(Ë);t.result.scrollTop=new_file['scroll_top'];t.result.scrollLeft=new_file['scroll_left'];t.previous=new_file['previous'];t.next=new_file['next'];t.last_undo=new_file['last_undo'];t.check_redo(Ë);t.check_undo(Ë);t.execCommand(\"change_highlight\",new_file['do_highlight']);t.execCommand(\"change_syntax\",new_file['syntax']);t.execCommand(\"change_smooth_selection_mode\",new_file['smooth_selection']);t.execCommand(\"set_word_wrap\",new_file['word_wrap']);a_links=new_file['toolbar']['links'];for(i in a_links){if(img=_$(i).getElementsByTagName('img')[0]){img.classLock=a_links[i]['classLock'];img.className=a_links[i]['className'];img.oldClassName=a_links[i]['oldClassName'];}}a_selects=new_file['toolbar']['selects'];for(i in a_selects){a_options=_$(i).options;for(j=0;j<a_options.Æ;j++){if(a_options[j].Ê==a_selects[i])_$(i).options[j].selected=Ë;}}};EA.Ä.switch_to_file=Ã(file_to_show,force_refresh){if(file_to_show!=Á.curr_file||force_refresh){Á.save_file(Á.curr_file);if(Á.curr_file!='')Á.execCommand('file_switch_off',Á.files[Á.curr_file]);Á.display_file(file_to_show);if(file_to_show!='')Á.execCommand('file_switch_on',Á.files[file_to_show]);}};EA.Ä.get_file=Ã(id){if(id==Á.curr_file)Á.save_file(id);return Á.files[id];};EA.Ä.get_all_files=Ã(){tmp_files=Á.files;Á.save_file(Á.curr_file);if(tmp_files[''])delete(Á.files['']);return tmp_files;};EA.Ä.check_file_changes=Ã(){var id=Á.curr_file;if(Á.files[id]&&Á.files[id]['compare_edited_text']!=undefined){if(Á.files[id]['compare_edited_text'].Æ==Á.Â.Ê.Æ&&Á.files[id]['compare_edited_text']==Á.Â.Ê){if(Á.files[id]['edited']!=Ì)Á.set_file_edited_mode(id,Ì);}\nelse{if(Á.files[id]['edited']!=Ë)Á.set_file_edited_mode(id,Ë);}}};EA.Ä.set_file_edited_mode=Ã(id,to){if(Á.files[id]&&_$(Á.files[id]['html_id'])){var link=_$(Á.files[id]['html_id']).getElementsByTagName('a')[0];if(to==Ë){link.className='edited';}\nelse{link.className='';if(id==Á.curr_file)text=Á.Â.Ê;\nelse text=Á.files[id]['text'];Á.files[id]['compare_edited_text']=text;}Á.files[id]['edited']=to;}};EA.Ä.set_show_line_colors=Ã(new_Ê){Á.show_line_colors=new_Ê;if(new_Ê)Á.selection_field.className+=' show_colors';\nelse Á.selection_field.className=Á.selection_field.className.replace(/ show_colors/g,'');};var EA_keys={8:\"Retour arriere\",9:\"Tabulation\",12:\"Milieu(pave numerique)\",13:\"Entrer\",16:\"Shift\",17:\"Ctrl\",18:\"Alt\",19:\"Pause\",20:\"Verr Maj\",27:\"Esc\",32:\"Space\",33:\"Page up\",34:\"Page down\",35:\"End\",36:\"Begin\",37:\"Left\",38:\"Up\",39:\"Right\",40:\"Down\",44:\"Impr ecran\",45:\"Inser\",46:\"Suppr\",91:\"Menu Demarrer Windows / touche pomme Mac\",92:\"Menu Demarrer Windows\",93:\"Menu contextuel Windows\",112:\"F1\",113:\"F2\",114:\"F3\",115:\"F4\",116:\"F5\",117:\"F6\",118:\"F7\",119:\"F8\",120:\"F9\",121:\"F10\",122:\"F11\",123:\"F12\",144:\"Verr Num\",145:\"Arret defil\"};Ã keyDown(e){if(!e){e=event;}for(var i in eA.plugins){if(typeof(eA.plugins[i].onkeydown)==\"Ã\"){if(eA.plugins[i].onkeydown(e)===Ì){if(eA.isIE)e.keyCode=0;return Ì;}}}var target_id=(e.target||e.srcElement).id;var use=Ì;if(EA_keys[e.keyCode])letter=EA_keys[e.keyCode];\nelse letter=String.fromCharCode(e.keyCode);var low_letter=letter.toLowerCase();if(letter==\"Page up\"&&!AltPressed(e)&&!eA.isOpera){eA.execCommand(\"scroll_page\",{\"dir\":\"up\",\"shift\":ShiftPressed(e)});use=Ë;}\nelse if(letter==\"Page down\"&&!AltPressed(e)&&!eA.isOpera){eA.execCommand(\"scroll_page\",{\"dir\":\"down\",\"shift\":ShiftPressed(e)});use=Ë;}\nelse if(eA.is_editable==Ì){return Ë;}\nelse if(letter==\"Tabulation\"&&target_id==\"Â\"&&!CtrlPressed(e)&&!AltPressed(e)){if(ShiftPressed(e))eA.execCommand(\"invert_tab_selection\");\nelse eA.execCommand(\"tab_selection\");use=Ë;if(eA.isOpera||(eA.isFirefox&&eA.isMac))setTimeout(\"eA.execCommand('focus');\",1);}\nelse if(letter==\"Entrer\"&&target_id==\"Â\"){if(eA.press_enter())use=Ë;}\nelse if(letter==\"Entrer\"&&target_id==\"area_search\"){eA.execCommand(\"area_search\");use=Ë;}\nelse  if(letter==\"Esc\"){eA.execCommand(\"close_all_inline_popup\",e);use=Ë;}\nelse if(CtrlPressed(e)&&!AltPressed(e)&&!ShiftPressed(e)){switch(low_letter){case \"f\":eA.execCommand(\"area_search\");use=Ë;break;case \"r\":eA.execCommand(\"area_replace\");use=Ë;break;case \"q\":eA.execCommand(\"close_all_inline_popup\",e);use=Ë;break;case \"h\":eA.execCommand(\"change_highlight\");use=Ë;break;case \"g\":setTimeout(\"eA.execCommand('go_to_line');\",5);use=Ë;break;case \"e\":eA.execCommand(\"show_help\");use=Ë;break;case \"z\":use=Ë;eA.execCommand(\"undo\");break;case \"y\":use=Ë;eA.execCommand(\"redo\");break;default:break;}}if(eA.next.Æ > 0){setTimeout(\"eA.check_redo();\",10);}setTimeout(\"eA.check_file_changes();\",10);if(use){if(eA.isIE)e.keyCode=0;return Ì;}return Ë;};Ã AltPressed(e){if(window.event){return(window.event.altKey);}\nelse{if(e.modifiers)return(e.altKey||(e.modifiers % 2));\nelse return e.altKey;}};Ã CtrlPressed(e){if(window.event){return(window.event.ctrlKey);}\nelse{return(e.ctrlKey||(e.modifiers==2)||(e.modifiers==3)||(e.modifiers>5));}};Ã ShiftPressed(e){if(window.event){return(window.event.shiftKey);}\nelse{return(e.shiftKey||(e.modifiers>3));}};	EA.Ä.show_search=Ã(){if(_$(\"area_search_replace\").Ç.visibility==\"visible\"){Á.hidden_search();}\nelse{Á.open_inline_popup(\"area_search_replace\");var text=Á.area_get_selection();var search=text.split(\"\\n\")[0];_$(\"area_search\").Ê=search;_$(\"area_search\").focus();}};EA.Ä.hidden_search=Ã(){Á.close_inline_popup(\"area_search_replace\");};EA.Ä.area_search=Ã(mode){if(!mode)mode=\"search\";_$(\"area_search_msg\").innerHTML=\"\";var search=_$(\"area_search\").Ê;Á.Â.focus();Á.Â.ÂFocused=Ë;var infos=Á.get_selection_infos();var start=infos[\"selectionStart\"];var pos=-1;var pos_begin=-1;var Æ=search.Æ;if(_$(\"area_search_replace\").Ç.visibility!=\"visible\"){Á.show_search();return;}if(search.Æ==0){_$(\"area_search_msg\").innerHTML=Á.get_translation(\"search_field_empty\");return;}if(mode!=\"replace\"){if(_$(\"area_search_reg_exp\").checked)start++;\nelse start+=search.Æ;}if(_$(\"area_search_reg_exp\").checked){var opt=\"m\";if(!_$(\"area_search_match_case\").checked)opt+=\"i\";var reg=new RegExp(search,opt);pos=infos[\"full_text\"].substr(start).search(reg);pos_begin=infos[\"full_text\"].search(reg);if(pos!=-1){pos+=start;Æ=infos[\"full_text\"].substr(start).match(reg)[0].Æ;}\nelse if(pos_begin!=-1){Æ=infos[\"full_text\"].match(reg)[0].Æ;}}\nelse{if(_$(\"area_search_match_case\").checked){pos=infos[\"full_text\"].indexOf(search,start);pos_begin=infos[\"full_text\"].indexOf(search);}\nelse{pos=infos[\"full_text\"].toLowerCase().indexOf(search.toLowerCase(),start);pos_begin=infos[\"full_text\"].toLowerCase().indexOf(search.toLowerCase());}}if(pos==-1&&pos_begin==-1){_$(\"area_search_msg\").innerHTML=\"<strong>\"+search+\"</strong> \"+Á.get_translation(\"not_found\");return;}\nelse if(pos==-1&&pos_begin !=-1){begin=pos_begin;_$(\"area_search_msg\").innerHTML=Á.get_translation(\"restart_search_at_begin\");}\nelse begin=pos;if(mode==\"replace\"&&pos==infos[\"indexOfCursor\"]){var replace=_$(\"area_replace\").Ê;var new_text=\"\";if(_$(\"area_search_reg_exp\").checked){var opt=\"m\";if(!_$(\"area_search_match_case\").checked)opt+=\"i\";var reg=new RegExp(search,opt);new_text=infos[\"full_text\"].substr(0,begin)+infos[\"full_text\"].substr(start).replace(reg,replace);}\nelse{new_text=infos[\"full_text\"].substr(0,begin)+replace+infos[\"full_text\"].substr(begin+Æ);}Á.Â.Ê=new_text;Á.area_select(begin,Æ);Á.area_search();}\nelse Á.area_select(begin,Æ);};EA.Ä.area_replace=Ã(){Á.area_search(\"replace\");};EA.Ä.area_replace_all=Ã(){var base_text=Á.Â.Ê;var search=_$(\"area_search\").Ê;var replace=_$(\"area_replace\").Ê;if(search.Æ==0){_$(\"area_search_msg\").innerHTML=Á.get_translation(\"search_field_empty\");return;}var new_text=\"\";var nb_change=0;if(_$(\"area_search_reg_exp\").checked){var opt=\"mg\";if(!_$(\"area_search_match_case\").checked)opt+=\"i\";var reg=new RegExp(search,opt);nb_change=infos[\"full_text\"].match(reg).Æ;new_text=infos[\"full_text\"].replace(reg,replace);}\nelse{if(_$(\"area_search_match_case\").checked){var tmp_tab=base_text.split(search);nb_change=tmp_tab.Æ-1;new_text=tmp_tab.join(replace);}\nelse{var lower_Ê=base_text.toLowerCase();var lower_search=search.toLowerCase();var start=0;var pos=lower_Ê.indexOf(lower_search);while(pos!=-1){nb_change++;new_text+=Á.Â.Ê.substring(start,pos)+replace;start=pos+search.Æ;pos=lower_Ê.indexOf(lower_search,pos+1);}new_text+=Á.Â.Ê.substring(start);}}if(new_text==base_text){_$(\"area_search_msg\").innerHTML=\"<strong>\"+search+\"</strong> \"+Á.get_translation(\"not_found\");}\nelse{Á.Â.Ê=new_text;_$(\"area_search_msg\").innerHTML=\"<strong>\"+nb_change+\"</strong> \"+Á.get_translation(\"occurrence_replaced\");setTimeout(\"eA.Â.focus();eA.Â.ÂFocused=Ë;\",100);}}; EA.Ä.change_highlight=Ã(change_to){if(Á.Å[\"syntax\"].Æ==0&&change_to==Ì){Á.switchClassSticky(_$(\"highlight\"),'editAreaButtonDisabled',Ë);Á.switchClassSticky(_$(\"reset_highlight\"),'editAreaButtonDisabled',Ë);return Ì;}if(Á.do_highlight==change_to)return Ì;Á.getIESelection();var pos_start=Á.Â.selectionStart;var pos_end=Á.Â.selectionEnd;if(Á.do_highlight===Ë||change_to==Ì)Á.disable_highlight();\nelse Á.enable_highlight();Á.Â.focus();Á.Â.selectionStart=pos_start;Á.Â.selectionEnd=pos_end;Á.setIESelection();};EA.Ä.disable_highlight=Ã(displayOnly){var t=Á,a=t.Â,new_Obj,old_class,new_class;t.selection_field.innerHTML=\"\";t.selection_field_text.innerHTML=\"\";t.content_highlight.Ç.visibility=\"hidden\";new_Obj=t.content_highlight.cloneNode(Ì);new_Obj.innerHTML=\"\";t.content_highlight.ÈNode.insertBefore(new_Obj,t.content_highlight);t.content_highlight.ÈNode.removeChild(t.content_highlight);t.content_highlight=new_Obj;old_class=È.getAttribute(a,\"class\");if(old_class){new_class=old_class.replace(\"hidden\",\"\");È.setAttribute(a,\"class\",new_class);}a.Ç.backgroundColor=\"transÈ\";t.switchClassSticky(_$(\"highlight\"),'editAreaButtonNormal',Ë);t.switchClassSticky(_$(\"reset_highlight\"),'editAreaButtonDisabled',Ë);t.do_highlight=Ì;t.switchClassSticky(_$(\"change_smooth_selection\"),'editAreaButtonSelected',Ë);if(typeof(t.smooth_selection_before_highlight)!=\"undefined\"&&t.smooth_selection_before_highlight===Ì){t.change_smooth_selection_mode(Ì);}};EA.Ä.enable_highlight=Ã(){var t=Á,a=t.Â,new_class;t.show_waiting_screen();t.content_highlight.Ç.visibility=\"visible\";new_class=È.getAttribute(a,\"class\")+\" hidden\";È.setAttribute(a,\"class\",new_class);if(t.isIE)a.Ç.backgroundColor=\"#FFFFFF\";t.switchClassSticky(_$(\"highlight\"),'editAreaButtonSelected',Ì);t.switchClassSticky(_$(\"reset_highlight\"),'editAreaButtonNormal',Ì);t.smooth_selection_before_highlight=t.smooth_selection;if(!t.smooth_selection)t.change_smooth_selection_mode(Ë);t.switchClassSticky(_$(\"change_smooth_selection\"),'editAreaButtonDisabled',Ë);t.do_highlight=Ë;t.resync_highlight();t.hide_waiting_screen();};EA.Ä.maj_highlight=Ã(infos){var debug_opti=\"\",tps_start=new Date().getTime(),tps_middle_opti=new Date().getTime();var t=Á,hightlighted_text,updated_highlight;var textToHighlight=infos[\"full_text\"],doSyntaxOpti=Ì,doHtmlOpti=Ì,stay_begin=\"\",stay_end=\"\",trace_new,trace_last;if(t.last_text_to_highlight==infos[\"full_text\"]&&t.resync_highlight!==Ë)return;if(t.reload_highlight===Ë){t.reload_highlight=Ì;}\nelse if(textToHighlight.Æ==0){textToHighlight=\"\\n \";}\nelse{changes=t.checkTextEvolution(t.last_text_to_highlight,textToHighlight);trace_new=t.get_syntax_trace(changes.newTextLine).replace(/\\r/g,'');trace_last=t.get_syntax_trace(changes.lastTextLine).replace(/\\r/g,'');doSyntaxOpti=(trace_new==trace_last);if(!doSyntaxOpti&&trace_new==\"\\n\"+trace_last&&/^[ \t\s]*\\n[ \t\s]*$/.test(changes.newText.replace(/\\r/g,''))&&changes.lastText==\"\"){doSyntaxOpti=Ë;}if(doSyntaxOpti){tps_middle_opti=new Date().getTime();stay_begin=t.last_hightlighted_text.split(\"\\n\").slice(0,changes.lineStart).join(\"\\n\");if(changes.lineStart>0)stay_begin+=\"\\n\";stay_end=t.last_hightlighted_text.split(\"\\n\").slice(changes.lineLastEnd+1).join(\"\\n\");if(stay_end.Æ>0)stay_end=\"\\n\"+stay_end;if(stay_begin.split('<span').Æ !=stay_begin.split('</span').Æ||stay_end.split('<span').Æ !=stay_end.split('</span').Æ){doSyntaxOpti=Ì;stay_end='';stay_begin='';}\nelse{if(stay_begin.Æ==0&&changes.posLastEnd==-1)changes.newTextLine+=\"\\n\";textToHighlight=changes.newTextLine;}}if(t.Å[\"debug\"]){var ch=changes;debug_opti=(doSyntaxOpti?\"Optimisation\":\"No optimisation\")+\" start:\"+ch.posStart+\"(\"+ch.lineStart+\")\"+\" end_new:\"+ch.posNewEnd+\"(\"+ch.lineNewEnd+\")\"+\" end_last:\"+ch.posLastEnd+\"(\"+ch.lineLastEnd+\")\"+\"\\nchanged_text:\"+ch.newText+\"=> trace:\"+trace_new+\"\\nchanged_last_text:\"+ch.lastText+\"=> trace:\"+trace_last+\"\\nchanged_line:\"+ch.newTextLine+\"\\nlast_changed_line:\"+ch.lastTextLine+\"\\nstay_begin:\"+stay_begin.slice(-100)+\"\\nstay_end:\"+stay_end.substr(0,100);+\"\\n\";}}tps_end_opti=new Date().getTime();updated_highlight=t.colorize_text(textToHighlight);tpsAfterReg=new Date().getTime();doSyntaxOpti=doHtmlOpti=Ì;if(doSyntaxOpti){try{var replacedBloc,i,nbStart='',nbEnd='',newHtml,ÆOld,ÆNew;replacedBloc=t.last_hightlighted_text.substring(stay_begin.Æ,t.last_hightlighted_text.Æ-stay_end.Æ);ÆOld=replacedBloc.Æ;ÆNew=updated_highlight.Æ;for(i=0;i < ÆOld&&i < ÆNew&&replacedBloc.charAt(i)==updated_highlight.charAt(i);i++){}nbStart=i;for(i=0;i+nbStart < ÆOld&&i+nbStart < ÆNew&&replacedBloc.charAt(ÆOld-i-1)==updated_highlight.charAt(ÆNew-i-1);i++){}nbEnd=i;lastHtml=replacedBloc.substring(nbStart,ÆOld-nbEnd);newHtml=updated_highlight.substring(nbStart,ÆNew-nbEnd);if(newHtml.indexOf('<span')==-1&&newHtml.indexOf('</span')==-1&&lastHtml.indexOf('<span')==-1&&lastHtml.indexOf('</span')==-1){var beginStr,nbOpendedSpan,nbClosedSpan,nbUnchangedChars,span,textNode;doHtmlOpti=Ë;beginStr=t.last_hightlighted_text.substr(0,stay_begin.Æ+nbStart);newHtml=newHtml.replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&');nbOpendedSpan=beginStr.split('<span').Æ-1;nbClosedSpan=beginStr.split('</span').Æ-1;span=t.content_highlight.getElementsByTagName('span')[ nbOpendedSpan ];ÈSpan=span;maxStartOffset=maxEndOffset=0;if(nbOpendedSpan==nbClosedSpan){while(ÈSpan.ÈNode !=t.content_highlight&&ÈSpan.ÈNode.tagName !='PRE'){ÈSpan=ÈSpan.ÈNode;}}\nelse{maxStartOffset=maxEndOffset=beginStr.Æ+1;nbClosed=beginStr.substr(Math.max(0,beginStr.lastIndexOf('<span',maxStartOffset-1))).split('</span').Æ-1;while(nbClosed > 0){nbClosed--;ÈSpan=ÈSpan.ÈNode;}while(ÈSpan.ÈNode !=t.content_highlight&&ÈSpan.ÈNode.tagName !='PRE'&&(tmpMaxStartOffset=Math.max(0,beginStr.lastIndexOf('<span',maxStartOffset-1)))<(tmpMaxEndOffset=Math.max(0,beginStr.lastIndexOf('</span',maxEndOffset-1)))){maxStartOffset=tmpMaxStartOffset;maxEndOffset=tmpMaxEndOffset;}}if(ÈSpan.ÈNode==t.content_highlight||ÈSpan.ÈNode.tagName=='PRE'){maxStartOffset=Math.max(0,beginStr.indexOf('<span'));}if(maxStartOffset==beginStr.Æ){nbSubSpanBefore=0;}\nelse{lastEndPos=Math.max(0,beginStr.lastIndexOf('>',maxStartOffset));nbSubSpanBefore=beginStr.substr(lastEndPos).split('<span').Æ-1;}if(nbSubSpanBefore==0){textNode=ÈSpan.firstChild;}\nelse{lastSubSpan=ÈSpan.getElementsByTagName('span')[ nbSubSpanBefore-1 ];while(lastSubSpan.ÈNode !=ÈSpan){lastSubSpan=lastSubSpan.ÈNode;}if(lastSubSpan.nextSibling==null||lastSubSpan.nextSibling.nodeType !=3){textNode=document.createTextNode('');lastSubSpan.ÈNode.insertBefore(textNode,lastSubSpan.nextSibling);}\nelse{textNode=lastSubSpan.nextSibling;}}if((lastIndex=beginStr.lastIndexOf('>'))==-1){nbUnchangedChars=beginStr.Æ;}\nelse{nbUnchangedChars=beginStr.substr(lastIndex+1).replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&').Æ;}if(t.isIE){nbUnchangedChars-=(beginStr.substr(beginStr.Æ-nbUnchangedChars).split(\"\\n\").Æ-1);textNode.replaceData(nbUnchangedChars,lastHtml.replace(/\\n/g,'').Æ,newHtml.replace(/\\n/g,''));}\nelse{textNode.replaceData(nbUnchangedChars,lastHtml.Æ,newHtml);}}}catch(e){doHtmlOpti=Ì;}}tpsAfterOpti2=new Date().getTime();hightlighted_text=stay_begin+updated_highlight+stay_end;if(!doHtmlOpti){var new_Obj=t.content_highlight.cloneNode(Ì);if((t.isIE&&t.isIE < 8)||(t.isOpera&&t.isOpera < 9.6))new_Obj.innerHTML=\"<pre><span class='\"+t.Å[\"syntax\"]+\"'>\"+hightlighted_text+\"</span></pre>\";\nelse new_Obj.innerHTML=\"<span class='\"+t.Å[\"syntax\"]+\"'>\"+hightlighted_text+\"</span>\";t.content_highlight.ÈNode.replaceChild(new_Obj,t.content_highlight);t.content_highlight=new_Obj;}t.last_text_to_highlight=infos[\"full_text\"];t.last_hightlighted_text=hightlighted_text;tps3=new Date().getTime();if(t.Å[\"debug\"]){t.debug.Ê=\"Tps optimisation \"+(tps_end_opti-tps_start)+\" | tps reg exp:\"+(tpsAfterReg-tps_end_opti)+\" | tps opti HTML:\"+(tpsAfterOpti2-tpsAfterReg)+' '+(doHtmlOpti ? 'yes':'no')+\" | tps update highlight content:\"+(tps3-tpsAfterOpti2)+\" | tpsTotal:\"+(tps3-tps_start)+\"(\"+tps3+\")\\n\"+debug_opti;}};EA.Ä.resync_highlight=Ã(reload_now){Á.reload_highlight=Ë;Á.last_text_to_highlight=\"\";Á.focus();if(reload_now)Á.check_line_selection(Ì);}; EA.Ä.comment_or_quote=Ã(){var new_class=\"\",close_tag=\"\",sy,arg,i;sy=È.eAL.syntax[eA.current_code_lang];arg=EA.Ä.comment_or_quote.arguments[0];for(i in sy[\"quotes\"]){if(arg.indexOf(i)==0){new_class=\"quotesmarks\";close_tag=sy[\"quotes\"][i];}}if(new_class.Æ==0){for(var i in sy[\"comments\"]){if(arg.indexOf(i)==0){new_class=\"comments\";close_tag=sy[\"comments\"][i];}}}if(close_tag==\"\\n\"){return \"µ__\"+new_class+\"__µ\"+arg.replace(/(\\r?\\n)?$/m,\"µ_END_µ$1\");}\nelse{reg=new RegExp(È.eAL.get_escaped_regexp(close_tag)+\"$\",\"m\");if(arg.search(reg)!=-1)return \"µ__\"+new_class+\"__µ\"+arg+\"µ_END_µ\";\nelse return \"µ__\"+new_class+\"__µ\"+arg;}};EA.Ä.get_syntax_trace=Ã(text){if(Á.Å[\"syntax\"].Æ>0&&È.eAL.syntax[Á.Å[\"syntax\"]][\"syntax_trace_regexp\"])return text.replace(È.eAL.syntax[Á.Å[\"syntax\"]][\"syntax_trace_regexp\"],\"$3\");};EA.Ä.colorize_text=Ã(text){text=\" \"+text;if(Á.Å[\"syntax\"].Æ>0)text=Á.apply_syntax(text,Á.Å[\"syntax\"]);return text.substr(1).replace(/&/g,\"&amp;\").replace(/</g,\"&lt;\").replace(/>/g,\"&gt;\").replace(/µ_END_µ/g,\"</span>\").replace(/µ__([a-zA-Z0-9]+)__µ/g,\"<span class='$1'>\");};EA.Ä.apply_syntax=Ã(text,lang){var sy;Á.current_code_lang=lang;if(!È.eAL.syntax[lang])return text;sy=È.eAL.syntax[lang];if(sy[\"custom_regexp\"]['before']){for(var i in sy[\"custom_regexp\"]['before']){var convert=\"$1µ__\"+sy[\"custom_regexp\"]['before'][i]['class']+\"__µ$2µ_END_µ$3\";text=text.replace(sy[\"custom_regexp\"]['before'][i]['regexp'],convert);}}if(sy[\"comment_or_quote_reg_exp\"]){text=text.replace(sy[\"comment_or_quote_reg_exp\"],Á.comment_or_quote);}if(sy[\"keywords_reg_exp\"]){for(var i in sy[\"keywords_reg_exp\"]){text=text.replace(sy[\"keywords_reg_exp\"][i],'µ__'+i+'__µ$2µ_END_µ');}}if(sy[\"delimiters_reg_exp\"]){text=text.replace(sy[\"delimiters_reg_exp\"],'µ__delimiters__µ$1µ_END_µ');}if(sy[\"operators_reg_exp\"]){text=text.replace(sy[\"operators_reg_exp\"],'µ__operators__µ$1µ_END_µ');}if(sy[\"custom_regexp\"]['after']){for(var i in sy[\"custom_regexp\"]['after']){var convert=\"$1µ__\"+sy[\"custom_regexp\"]['after'][i]['class']+\"__µ$2µ_END_µ$3\";text=text.replace(sy[\"custom_regexp\"]['after'][i]['regexp'],convert);}}return text;};var editArea= eA;EditArea=EA;</script>".replace(/Á/g, 'this').replace(/Â/g, 'textarea').replace(/Ã/g, 'function').replace(/Ä/g, 'prototype').replace(/Å/g, 'settings').replace(/Æ/g, 'length').replace(/Ç/g, 'style').replace(/È/g, 'parent').replace(/É/g, 'last_selection').replace(/Ê/g, 'value').replace(/Ë/g, 'true').replace(/Ì/g, 'false');
- editAreaLoader.template = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\"> <html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" > <head> <title>EditArea</title> <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /> <meta http-equiv=\"X-UA-Compatible\" content=\"IE=EmulateIE7\"/> [__CSSRULES__] [__JSCODE__] </head> <body> <div id='editor'> <div class='area_toolbar' id='toolbar_1'>[__TOOLBAR__]</div> <div class='area_toolbar' id='tab_browsing_area'><ul id='tab_browsing_list' class='menu'> <li> </li> </ul></div> <div id='result'> <div id='no_file_selected'></div> <div id='container'> <div id='cursor_pos' class='edit_area_cursor'>&nbsp;</div> <div id='end_bracket' class='edit_area_cursor'>&nbsp;</div> <div id='selection_field'></div> <div id='line_number' selec='none'></div> <div id='content_highlight'></div> <div id='test_font_size'></div> <div id='selection_field_text'></div> <textarea id='textarea' wrap='off' onchange='editArea.execCommand(\"onchange\");' onfocus='javascript:editArea.textareaFocused=true;' onblur='javascript:editArea.textareaFocused=false;'> </textarea> </div> </div> <div class='area_toolbar' id='toolbar_2'> <table class='statusbar' cellspacing='0' cellpadding='0'> <tr> <td class='total' selec='none'>{$position}:</td> <td class='infos' selec='none'> {$line_abbr} <span  id='linePos'>0</span>, {$char_abbr} <span id='currPos'>0</span> </td> <td class='total' selec='none'>{$total}:</td> <td class='infos' selec='none'> {$line_abbr} <span id='nbLine'>0</span>, {$char_abbr} <span id='nbChar'>0</span> </td> <td class='resize'> <span id='resize_area'><img src='[__BASEURL__]images/statusbar_resize.gif' alt='resize' selec='none'></span> </td> </tr> </table> </div> </div> <div id='processing'> <div id='processing_text'> {$processing} </div> </div> <div id='area_search_replace' class='editarea_popup'> <table cellspacing='2' cellpadding='0' style='width: 100%'> <tr> <td selec='none'>{$search}</td> <td><input type='text' id='area_search' /></td> <td id='close_area_search_replace'> <a onclick='Javascript:editArea.execCommand(\"hidden_search\")'><img selec='none' src='[__BASEURL__]images/close.gif' alt='{$close_popup}' title='{$close_popup}' /></a><br /> </tr><tr> <td selec='none'>{$replace}</td> <td><input type='text' id='area_replace' /></td> <td><img id='move_area_search_replace' onmousedown='return parent.start_move_element(event,\"area_search_replace\", parent.frames[\"frame_\"+editArea.id]);'  src='[__BASEURL__]images/move.gif' alt='{$move_popup}' title='{$move_popup}' /></td> </tr> </table> <div class='button'> <input type='checkbox' id='area_search_match_case' /><label for='area_search_match_case' selec='none'>{$match_case}</label> <input type='checkbox' id='area_search_reg_exp' /><label for='area_search_reg_exp' selec='none'>{$reg_exp}</label> <br /> <a onclick='Javascript:editArea.execCommand(\"area_search\")' selec='none'>{$find_next}</a> <a onclick='Javascript:editArea.execCommand(\"area_replace\")' selec='none'>{$replace}</a> <a onclick='Javascript:editArea.execCommand(\"area_replace_all\")' selec='none'>{$replace_all}</a><br /> </div> <div id='area_search_msg' selec='none'></div> </div> <div id='edit_area_help' class='editarea_popup'> <div class='close_popup'> <a onclick='Javascript:editArea.execCommand(\"close_all_inline_popup\")'><img src='[__BASEURL__]images/close.gif' alt='{$close_popup}' title='{$close_popup}' /></a> </div> <div><h2>Editarea [__EA_VERSION__]</h2><br /> <h3>{$shortcuts}:</h3> {$tab}: {$add_tab}<br /> {$shift}+{$tab}: {$remove_tab}<br /> {$ctrl}+f: {$search_command}<br /> {$ctrl}+r: {$replace_command}<br /> {$ctrl}+h: {$highlight}<br /> {$ctrl}+g: {$go_to_line}<br /> {$ctrl}+z: {$undo}<br /> {$ctrl}+y: {$redo}<br /> {$ctrl}+e: {$help}<br /> {$ctrl}+q, {$esc}: {$close_popup}<br /> {$accesskey} E: {$toggle}<br /> <br /> <em>{$about_notice}</em> <br /><div class='copyright'>&copy; Christophe Dolivet 2007-2010</div> </div> </div> </body> </html> ";
- editAreaLoader.iframe_css = "<style>body,html{margin:0;padding:0;height:100%;border:none;overflow:hidden;background-color:#FFF;}body,html,table,form,textarea{font:12px monospace,sans-serif;}#editor{border:solid #888 1px;overflow:hidden;}#result{z-index:4;overflow-x:auto;overflow-y:scroll;border-top:solid #888 1px;border-bottom:solid #888 1px;position:relative;clear:both;}#result.empty{overflow:hidden;}#container{overflow:hidden;border:solid blue 0;position:relative;z-index:10;padding:0 5px 0 45px;}#textarea{position:relative;top:0;left:0;margin:0;padding:0;width:100%;height:100%;overflow:hidden;z-index:7;border-width:0;background-color:transparent;resize:none;}#textarea,#textarea:hover{outline:none;}#content_highlight{white-space:pre;margin:0;padding:0;position:absolute;z-index:4;overflow:visible;}#selection_field,#selection_field_text{margin:0;background-color:#E1F2F9;position:absolute;z-index:5;top:-100px;padding:0;white-space:pre;overflow:hidden;}#selection_field.show_colors {z-index:3;background-color:#EDF9FC;}#selection_field strong{font-weight:normal;}#selection_field.show_colors *,#selection_field_text * {visibility:hidden;}#selection_field_text{background-color:transparent;}#selection_field_text strong{font-weight:normal;background-color:#3399FE;color:#FFF;visibility:visible;}#container.word_wrap #content_highlight,#container.word_wrap #selection_field,#container.word_wrap #selection_field_text,#container.word_wrap #test_font_size{white-space:pre-wrap;white-space:-moz-pre-wrap !important;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;width:99%;}#line_number{position:absolute;overflow:hidden;border-right:solid black 1px;z-index:8;width:38px;padding:0 5px 0 0;margin:0 0 0 -45px;text-align:right;color:#AAAAAA;}#test_font_size{padding:0;margin:0;visibility:hidden;position:absolute;white-space:pre;}pre{margin:0;padding:0;}.hidden{opacity:0.2;filter:alpha(opacity=20);}#result .edit_area_cursor{position:absolute;z-index:6;background-color:#FF6633;top:-100px;margin:0;}#result .edit_area_selection_field .overline{background-color:#996600;}.editarea_popup{border:solid 1px #888888;background-color:#eeeeee;width:250px;padding:4px;position:absolute;visibility:hidden;z-index:15;top:-500px;}.editarea_popup,.editarea_popup table{font-family:sans-serif;font-size:10pt;}.editarea_popup img{border:0;}.editarea_popup .close_popup{float:right;line-height:16px;border:0;padding:0;}.editarea_popup h1,.editarea_popup h2,.editarea_popup h3,.editarea_popup h4,.editarea_popup h5,.editarea_popup h6{margin:0;padding:0;}.editarea_popup .copyright{text-align:right;}div#area_search_replace{}div#area_search_replace img{border:0;}div#area_search_replace div.button{text-align:center;line-height:1.7em;}div#area_search_replace .button a{cursor:pointer;border:solid 1px #888888;background-color:#DEDEDE;text-decoration:none;padding:0 2px;color:#000000;white-space:nowrap;}div#area_search_replace a:hover{background-color:#EDEDED;}div#area_search_replace  #move_area_search_replace{cursor:move;border:solid 1px #888;}div#area_search_replace  #close_area_search_replace{text-align:right;vertical-align:top;white-space:nowrap;}div#area_search_replace  #area_search_msg{height:18px;overflow:hidden;border-top:solid 1px #888;margin-top:3px;}#edit_area_help{width:350px;}#edit_area_help div.close_popup{float:right;}.area_toolbar{width:100%;margin:0;padding:0;background-color:#eeeeee;text-align:center;}.area_toolbar,.area_toolbar table{font:11px sans-serif;}.area_toolbar img{border:0;vertical-align:middle;}.area_toolbar input{margin:0;padding:0;}.area_toolbar select{font-family:'MS Sans Serif',sans-serif,Verdana,Arial;font-size:7pt;font-weight:normal;margin:2px 0 0 0 ;padding:0;vertical-align:top;background-color:#F0F0EE;}table.statusbar{width:100%;}.area_toolbar td.infos{text-align:center;width:130px;border-right:solid 1px #888;border-width:0 1px 0 0;padding:0;}.area_toolbar td.total{text-align:right;width:50px;padding:0;}.area_toolbar td.resize{text-align:right;}.area_toolbar span#resize_area{cursor:nw-resize;visibility:hidden;}.editAreaButtonNormal,.editAreaButtonOver,.editAreaButtonDown,.editAreaSeparator,.editAreaSeparatorLine,.editAreaButtonDisabled,.editAreaButtonSelected {border:0; margin:0; padding:0; background:transparent;margin-top:0;margin-left:1px;padding:0;}.editAreaButtonNormal {border:1px solid #eeeeee !important;cursor:pointer;}.editAreaButtonOver {border:1px solid #0A246A !important;cursor:pointer;background-color:#B6BDD2;}.editAreaButtonDown {cursor:pointer;border:1px solid #0A246A !important;background-color:#8592B5;}.editAreaButtonSelected {border:1px solid #C0C0BB !important;cursor:pointer;background-color:#F4F2E8;}.editAreaButtonDisabled {filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);-moz-opacity:0.3;opacity:0.3;border:1px solid #F0F0EE !important;cursor:pointer;}.editAreaSeparatorLine {margin:1px 2px;background-color:#C0C0BB;width:2px;height:18px;}#processing{display:none;background-color:#eeeeee;border:solid #888 1px;position:absolute;top:0;left:0;width:100%;height:100%;z-index:100;text-align:center;}#processing_text{position:absolute;left:50%;top:50%;width:200px;height:20px;margin-left:-100px;margin-top:-10px;text-align:center;}#tab_browsing_area{display:none;background-color:#CCC9A8;border-top:1px solid #888;text-align:left;margin:0;}#tab_browsing_list {padding:0;margin:0;list-style-type:none;white-space:nowrap;}#tab_browsing_list li {float:left;margin:-1px;}#tab_browsing_list a {position:relative;display:block;text-decoration:none;float:left;cursor:pointer;line-height:14px;}#tab_browsing_list a span {display:block;color:#000;background:#eeeeee;border:1px solid #888;border-width:1px 1px 0;text-align:center;padding:2px 2px 1px 4px;position:relative;}#tab_browsing_list a b {display:block;border-bottom:2px solid #617994;}#tab_browsing_list a .edited {display:none;}#tab_browsing_list a.edited .edited {display:inline;}#tab_browsing_list a img{margin-left:7px;}#tab_browsing_list a.edited img{margin-left:3px;}#tab_browsing_list a:hover span {background:#F4F2E8;border-color:#0A246A;}#tab_browsing_list .selected a span{background:#046380;color:#FFF;}#no_file_selected{height:100%;width:150%;background:#CCC;display:none;z-index:20;position:absolute;}.non_editable #editor{border-width:0 1px;}.non_editable .area_toolbar{display:none;}#auto_completion_area{background:#FFF;border:solid 1px #888;position:absolute;z-index:15;width:280px;height:180px;overflow:auto;display:none;}#auto_completion_area a,#auto_completion_area a:visited{display:block;padding:0 2px 1px;color:#000;text-decoration:none;}#auto_completion_area a:hover,#auto_completion_area a:focus,#auto_completion_area a.focus{background:#D6E1FE;text-decoration:none;}#auto_completion_area ul{margin:0;padding:0;list-style:none inside;}#auto_completion_area li{padding:0;}#auto_completion_area .prefix{font-style:italic;padding:0 3px;}</style>";
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/autocompletion.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/autocompletion.gif
deleted file mode 100644
index f3dfc2e3a..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/autocompletion.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/close.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/close.gif
deleted file mode 100644
index 679ca2aa4..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/close.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/fullscreen.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/fullscreen.gif
deleted file mode 100644
index 66fa6d921..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/fullscreen.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/go_to_line.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/go_to_line.gif
deleted file mode 100644
index 06042ec9a..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/go_to_line.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/help.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/help.gif
deleted file mode 100644
index 51a1ee420..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/help.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/highlight.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/highlight.gif
deleted file mode 100644
index 16491f6cf..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/highlight.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/load.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/load.gif
deleted file mode 100644
index 461698f56..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/load.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/move.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/move.gif
deleted file mode 100644
index d15f9f542..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/move.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/newdocument.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/newdocument.gif
deleted file mode 100644
index a9d293842..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/newdocument.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/opacity.png b/client/client-editor/src/main/resources/webapp/js/edit_area/images/opacity.png
deleted file mode 100644
index b4217cb21..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/opacity.png
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/processing.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/processing.gif
deleted file mode 100644
index cce32f20f..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/processing.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/redo.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/redo.gif
deleted file mode 100644
index 3af90697f..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/redo.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/reset_highlight.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/reset_highlight.gif
deleted file mode 100644
index 0fa3cb797..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/reset_highlight.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/save.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/save.gif
deleted file mode 100644
index 2777bebfe..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/save.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/search.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/search.gif
deleted file mode 100644
index cfe76b5d5..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/search.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/smooth_selection.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/smooth_selection.gif
deleted file mode 100644
index 8a532e5e6..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/smooth_selection.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/spacer.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/spacer.gif
deleted file mode 100644
index 388486517..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/spacer.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/statusbar_resize.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/statusbar_resize.gif
deleted file mode 100644
index af89d803f..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/statusbar_resize.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/undo.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/undo.gif
deleted file mode 100644
index 520796d69..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/undo.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/images/word_wrap.gif b/client/client-editor/src/main/resources/webapp/js/edit_area/images/word_wrap.gif
deleted file mode 100644
index 8f256ccbf..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/images/word_wrap.gif
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/bg.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/bg.js
deleted file mode 100644
index 9fdcec43c..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/bg.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *	Bulgarian translation
- *	Author:		Valentin Hristov
- *	Company:	SOFTKIT Bulgarian
- *	Site:		http://www.softkit-bg.com
- */
-editAreaLoader.lang["bg"]={
-new_document: "нов документ",
-search_button: "търсене и замяна",
-search_command: "търси следващия / отвори прозорец с търсачка",
-search: "търсене",
-replace: "замяна",
-replace_command: "замяна / отвори прозорец с търсачка",
-find_next: "намери следващия",
-replace_all: "замени всички",
-reg_exp: "реголярни изрази",
-match_case: "чуствителен към регистъра",
-not_found: "няма резултат.",
-occurrence_replaced: "замяната е осъществена.",
-search_field_empty: "Полето за търсене е празно",
-restart_search_at_begin: "До края на документа. Почни с началото.",
-move_popup: "премести прозореца с търсачката",
-font_size: "--Размер на шрифта--",
-go_to_line: "премени към реда",
-go_to_line_prompt: "премени към номера на реда:",
-undo: "отмени",
-redo: "върни",
-change_smooth_selection: "включи/изключи някой от функциите за преглед (по красиво, но повече натоварва)",
-highlight: "превключване на оцветяване на синтаксиса включена/изключена",
-reset_highlight: "въстанови оцветяване на синтаксиса (ако не е синхронизиран с текста)",
-word_wrap: "режим на пренасяне на дълги редове",
-help: "за програмата",
-save: "съхрани",
-load: "зареди",
-line_abbr: "Стр",
-char_abbr: "Стлб",
-position: "Позиция",
-total: "Всичко",
-close_popup: "затвори прозореца",
-shortcuts: "Бързи клавиши",
-add_tab: "добави табулация в текста",
-remove_tab: "премахни табулацията в текста",
-about_notice: "Внимание: използвайте функцията оцветяване на синтаксиса само за малки текстове",
-toggle: "Превключи редактор",
-accesskey: "Бърз клавиш",
-tab: "Tab",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "Зареждане...",
-fullscreen: "на цял екран",
-syntax_selection: "--Синтаксис--",
-close_tab: "Затвори файла"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/cs.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/cs.js
deleted file mode 100644
index b09a2771a..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/cs.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["cs"]={
-new_document: "Nový dokument",
-search_button: "Najdi a nahraď",
-search_command: "Hledej další / otevři vyhledávací pole",
-search: "Hledej",
-replace: "Nahraď",
-replace_command: "Nahraď / otevři vyhledávací pole",
-find_next: "Najdi další",
-replace_all: "Nahraď vše",
-reg_exp: "platné výrazy",
-match_case: "vyhodnocené výrazy",
-not_found: "nenalezené.",
-occurrence_replaced: "výskyty nahrazené.",
-search_field_empty: "Pole vyhledávání je prázdné",
-restart_search_at_begin: "Dosažen konec souboru, začínám od začátku.",
-move_popup: "Přesuň vyhledávací okno",
-font_size: "--Velikost textu--",
-go_to_line: "Přejdi na řádek",
-go_to_line_prompt: "Přejdi na řádek:",
-undo: "krok zpět",
-redo: "znovu",
-change_smooth_selection: "Povolit nebo zakázat některé ze zobrazených funkcí (účelnější zobrazení požaduje větší zatížení procesoru)",
-highlight: "Zvýrazňování syntaxe zap./vyp.",
-reset_highlight: "Obnovit zvýraznění (v případě nesrovnalostí)",
-word_wrap: "toggle word wrapping mode",
-help: "O programu",
-save: "Uložit",
-load: "Otevřít",
-line_abbr: "Ř.",
-char_abbr: "S.",
-position: "Pozice",
-total: "Celkem",
-close_popup: "Zavřít okno",
-shortcuts: "Zkratky",
-add_tab: "Přidat tabulování textu",
-remove_tab: "Odtsranit tabulování textu",
-about_notice: "Upozornění! Funkce zvýrazňování textu je k dispozici pouze pro malý text",
-toggle: "Přepnout editor",
-accesskey: "Přístupová klávesa",
-tab: "Záložka",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "Zpracovávám ...",
-fullscreen: "Celá obrazovka",
-syntax_selection: "--vyber zvýrazňovač--",
-close_tab: "Close file"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/de.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/de.js
deleted file mode 100644
index f23ea7b49..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/de.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["de"]={
-new_document: "Neues Dokument",
-search_button: "Suchen und Ersetzen",
-search_command: "Weitersuchen / &ouml;ffne Suchfeld",
-search: "Suchen",
-replace: "Ersetzen",
-replace_command: "Ersetzen / &ouml;ffne Suchfeld",
-find_next: "Weitersuchen",
-replace_all: "Ersetze alle Treffer",
-reg_exp: "regul&auml;re Ausdr&uuml;cke",
-match_case: "passt auf den Begriff<br />",
-not_found: "Nicht gefunden.",
-occurrence_replaced: "Die Vorkommen wurden ersetzt.",
-search_field_empty: "Leeres Suchfeld",
-restart_search_at_begin: "Ende des zu durchsuchenden Bereiches erreicht. Es wird die Suche von Anfang an fortgesetzt.", //find a shorter translation
-move_popup: "Suchfenster bewegen",
-font_size: "--Schriftgr&ouml;&szlig;e--",
-go_to_line: "Gehe zu Zeile",
-go_to_line_prompt: "Gehe zu Zeilennummmer:",
-undo: "R&uuml;ckg&auml;ngig",
-redo: "Wiederherstellen",
-change_smooth_selection: "Aktiviere/Deaktiviere einige Features (weniger Bildschirmnutzung aber mehr CPU-Belastung)",
-highlight: "Syntax Highlighting an- und ausschalten",
-reset_highlight: "Highlighting zur&uuml;cksetzen (falls mit Text nicht konform)",
-word_wrap: "Toggle word wrapping mode",
-help: "Info",
-save: "Speichern",
-load: "&Ouml;ffnen",
-line_abbr: "Ln",
-char_abbr: "Ch",
-position: "Position",
-total: "Gesamt",
-close_popup: "Popup schlie&szlig;en",
-shortcuts: "Shortcuts",
-add_tab: "Tab zum Text hinzuf&uuml;gen",
-remove_tab: "Tab aus Text entfernen",
-about_notice: "Bemerkung: Syntax Highlighting ist nur f&uuml;r kurze Texte",
-toggle: "Editor an- und ausschalten",
-accesskey: "Accesskey",
-tab: "Tab",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "In Bearbeitung...",
-fullscreen: "Full-Screen",
-syntax_selection: "--Syntax--",
-close_tab: "Close file"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/dk.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/dk.js
deleted file mode 100644
index 1381de2db..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/dk.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["dk"]={
-new_document: "nyt tomt dokument",
-search_button: "s&oslash;g og erstat",
-search_command: "find n&aelig;ste / &aring;ben s&oslash;gefelt",
-search: "s&oslash;g",
-replace: "erstat",
-replace_command: "erstat / &aring;ben s&oslash;gefelt",
-find_next: "find n&aelig;ste",
-replace_all: "erstat alle",
-reg_exp: "regular expressions",
-match_case: "forskel på store/sm&aring; bogstaver<br />",
-not_found: "not found.",
-occurrence_replaced: "occurences replaced.",
-search_field_empty: "Search field empty",
-restart_search_at_begin: "End of area reached. Restart at begin.",
-move_popup: "flyt søgepopup",
-font_size: "--Skriftstørrelse--",
-go_to_line: "g&aring; til linie",
-go_to_line_prompt: "gå til linienummer:",
-undo: "fortryd",
-redo: "gentag",
-change_smooth_selection: "sl&aring; display funktioner til/fra (smartere display men mere CPU kr&aelig;vende)",
-highlight: "sl&aring; syntax highlight til/fra",
-reset_highlight: "nulstil highlight (hvis den er desynkroniseret fra teksten)",
-word_wrap: "toggle word wrapping mode",
-help: "om",
-save: "gem",
-load: "hent",
-line_abbr: "Ln",
-char_abbr: "Ch",
-position: "Position",
-total: "Total",
-close_popup: "luk popup",
-shortcuts: "Genveje",
-add_tab: "tilf&oslash;j tabulation til tekst",
-remove_tab: "fjern tabulation fra tekst",
-about_notice: "Husk: syntax highlight funktionen b&oslash;r kun bruge til sm&aring; tekster",
-toggle: "Sl&aring; editor til / fra",
-accesskey: "Accesskey",
-tab: "Tab",
-shift: "Skift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "Processing...",
-fullscreen: "fullscreen",
-syntax_selection: "--Syntax--",
-close_tab: "Close file"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/en.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/en.js
deleted file mode 100644
index 9209f8947..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/en.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["en"]={
-new_document: "new empty document",
-search_button: "search and replace",
-search_command: "search next / open search area",
-search: "search",
-replace: "replace",
-replace_command: "replace / open search area",
-find_next: "find next",
-replace_all: "replace all",
-reg_exp: "regular expressions",
-match_case: "match case",
-not_found: "not found.",
-occurrence_replaced: "occurences replaced.",
-search_field_empty: "Search field empty",
-restart_search_at_begin: "End of area reached. Restart at begin.",
-move_popup: "move search popup",
-font_size: "--Font size--",
-go_to_line: "go to line",
-go_to_line_prompt: "go to line number:",
-undo: "undo",
-redo: "redo",
-change_smooth_selection: "enable/disable some display features (smarter display but more CPU charge)",
-highlight: "toggle syntax highlight on/off",
-reset_highlight: "reset highlight (if desyncronized from text)",
-word_wrap: "toggle word wrapping mode",
-help: "about",
-save: "save",
-load: "load",
-line_abbr: "Ln",
-char_abbr: "Ch",
-position: "Position",
-total: "Total",
-close_popup: "close popup",
-shortcuts: "Shortcuts",
-add_tab: "add tabulation to text",
-remove_tab: "remove tabulation to text",
-about_notice: "Notice: syntax highlight function is only for small text",
-toggle: "Toggle editor",
-accesskey: "Accesskey",
-tab: "Tab",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "Processing...",
-fullscreen: "fullscreen",
-syntax_selection: "--Syntax--",
-close_tab: "Close file"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/eo.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/eo.js
deleted file mode 100644
index 6583609cb..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/eo.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["eo"]={
-new_document: "nova dokumento (vakigas la enhavon)",
-search_button: "ser&#265;i / anstata&#365;igi",
-search_command: "pluser&#265;i / malfermi la ser&#265;o-fenestron",
-search: "ser&#265;i",
-replace: "anstata&#365;igi",
-replace_command: "anstata&#365;igi / malfermi la ser&#265;o-fenestron",
-find_next: "ser&#265;i",
-replace_all: "anstata&#365;igi &#265;ion",
-reg_exp: "regula esprimo",
-match_case: "respekti la usklecon",
-not_found: "ne trovita.",
-occurrence_replaced: "anstata&#365;igoj plenumitaj.",
-search_field_empty: "La kampo estas malplena.",
-restart_search_at_begin: "Fino de teksto &#285;isrirata, &#265;u da&#365;rigi el la komenco?",
-move_popup: "movi la ser&#265;o-fenestron",
-font_size: "--Tipara grando--",
-go_to_line: "iri al la linio",
-go_to_line_prompt: "iri al la linio numero:",
-undo: "rezigni",
-redo: "refari",
-change_smooth_selection: "ebligi/malebligi la funkcioj de vidigo (pli bona vidigo, sed pli da &#349;ar&#285;o de la &#265;eforgano)",
-highlight: "ebligi/malebligi la sintaksan kolorigon",
-reset_highlight: "repravalorizi la sintaksan kolorigon (se malsinkronigon de la teksto)",
-word_wrap: "toggle word wrapping mode",
-help: "pri",
-save: "registri",
-load: "&#349;ar&#285;i",
-line_abbr: "Ln",
-char_abbr: "Sg",
-position: "Pozicio",
-total: "Sumo",
-close_popup: "fermi la &#349;prucfenestron",
-shortcuts: "Fulmoklavo",
-add_tab: "aldoni tabon en la tekston",
-remove_tab: "forigi tablon el la teksto",
-about_notice: "Noto: la sintaksa kolorigo estas nur prikalkulita por mallongaj tekstoj.",
-toggle: "baskuligi la redaktilon",
-accesskey: "Fulmoklavo",
-tab: "Tab",
-shift: "Maj",
-ctrl: "Ktrl",
-esc: "Esk",
-processing: "&#349;argante...",
-fullscreen: "plenekrane",
-syntax_selection: "--Sintakso--",
-close_tab: "Fermi la dosieron"
-};
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/es.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/es.js
deleted file mode 100644
index 3892c1cd2..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/es.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["es"]={
-new_document: "nuevo documento vacío",
-search_button: "buscar y reemplazar",
-search_command: "buscar siguiente / abrir área de búsqueda",
-search: "buscar",
-replace: "reemplazar",
-replace_command: "reemplazar / abrir área de búsqueda",
-find_next: "encontrar siguiente",
-replace_all: "reemplazar todos",
-reg_exp: "expresiones regulares",
-match_case: "coincidir capitalización",
-not_found: "no encontrado.",
-occurrence_replaced: "ocurrencias reemplazadas.",
-search_field_empty: "Campo de búsqueda vacío",
-restart_search_at_begin: "Se ha llegado al final del área. Se va a seguir desde el principio.",
-move_popup: "mover la ventana de búsqueda",
-font_size: "--Tamaño de la fuente--",
-go_to_line: "ir a la línea",
-go_to_line_prompt: "ir a la línea número:",
-undo: "deshacer",
-redo: "rehacer",
-change_smooth_selection: "activar/desactivar algunas características de visualización (visualización más inteligente pero más carga de CPU)",
-highlight: "intercambiar resaltado de sintaxis",
-reset_highlight: "reinicializar resaltado (si no esta sincronizado con el texto)",
-word_wrap: "toggle word wrapping mode",
-help: "acerca",
-save: "guardar",
-load: "cargar",
-line_abbr: "Ln",
-char_abbr: "Ch",
-position: "Posición",
-total: "Total",
-close_popup: "recuadro de cierre",
-shortcuts: "Atajos",
-add_tab: "añadir tabulado al texto",
-remove_tab: "borrar tabulado del texto",
-about_notice: "Aviso: el resaltado de sintaxis sólo funciona para texto pequeño",
-toggle: "Cambiar editor",
-accesskey: "Tecla de acceso",
-tab: "Tab",
-shift: "Mayúsc",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "Procesando...",
-fullscreen: "pantalla completa",
-syntax_selection: "--Syntax--",
-close_tab: "Close file"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/fi.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/fi.js
deleted file mode 100644
index 1837883e6..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/fi.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["fi"]={
-new_document: "uusi tyhjä dokumentti",
-search_button: "etsi ja korvaa",
-search_command: "etsi seuraava / avaa etsintävalikko",
-search: "etsi",
-replace: "korvaa",
-replace_command: "korvaa / avaa etsintävalikko",
-find_next: "etsi seuraava",
-replace_all: "korvaa kaikki",
-reg_exp: "säännölliset lausekkeet",
-match_case: "täsmää kirjainkokoon",
-not_found: "ei löytynyt.",
-occurrence_replaced: "esiintymää korvattu.",
-search_field_empty: "Haettava merkkijono on tyhjä",
-restart_search_at_begin: "Alueen loppu saavutettiin. Aloitetaan alusta.",
-move_popup: "siirrä etsintävalikkoa",
-font_size: "--Fontin koko--",
-go_to_line: "siirry riville",
-go_to_line_prompt: "mene riville:",
-undo: "peruuta",
-redo: "tee uudelleen",
-change_smooth_selection: "kytke/sammuta joitakin näyttötoimintoja (Älykkäämpi toiminta, mutta suurempi CPU kuormitus)",
-highlight: "kytke syntaksikorostus päälle/pois",
-reset_highlight: "resetoi syntaksikorostus (jos teksti ei ole synkassa korostuksen kanssa)",
-word_wrap: "toggle word wrapping mode",
-help: "tietoja",
-save: "tallenna",
-load: "lataa",
-line_abbr: "Rv",
-char_abbr: "Pos",
-position: "Paikka",
-total: "Yhteensä",
-close_popup: "sulje valikko",
-shortcuts: "Pikatoiminnot",
-add_tab: "lisää sisennys tekstiin",
-remove_tab: "poista sisennys tekstistä",
-about_notice: "Huomautus: syntaksinkorostus toimii vain pienelle tekstille",
-toggle: "Kytke editori",
-accesskey: "Pikanäppäin",
-tab: "Tab",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "Odota...",
-fullscreen: "koko ruutu",
-syntax_selection: "--Syntaksi--",
-close_tab: "Sulje tiedosto"
-};
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/fr.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/fr.js
deleted file mode 100644
index f77416334..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/fr.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["fr"]={
-new_document: "nouveau document (efface le contenu)",
-search_button: "rechercher / remplacer",
-search_command: "rechercher suivant / ouvrir la fen&ecirc;tre de recherche",
-search: "rechercher",
-replace: "remplacer",
-replace_command: "remplacer / ouvrir la fen&ecirc;tre de recherche",
-find_next: "rechercher",
-replace_all: "tout remplacer",
-reg_exp: "expr. r&eacute;guli&egrave;re",
-match_case: "respecter la casse",
-not_found: "pas trouv&eacute;.",
-occurrence_replaced: "remplacements &eacute;ffectu&eacute;s.",
-search_field_empty: "Le champ de recherche est vide.",
-restart_search_at_begin: "Fin du texte atteint, poursuite au d&eacute;but.",
-move_popup: "d&eacute;placer la fen&ecirc;tre de recherche",
-font_size: "--Taille police--",
-go_to_line: "aller &agrave; la ligne",
-go_to_line_prompt: "aller a la ligne numero:",
-undo: "annuler",
-redo: "refaire",
-change_smooth_selection: "activer/d&eacute;sactiver des fonctions d'affichage (meilleur affichage mais plus de charge processeur)",
-highlight: "activer/d&eacute;sactiver la coloration syntaxique",
-reset_highlight: "r&eacute;initialiser la coloration syntaxique (si d&eacute;syncronis&eacute;e du texte)",
-word_wrap: "activer/d&eacute;sactiver les retours &agrave; la ligne automatiques",
-help: "&agrave; propos",
-save: "sauvegarder",
-load: "charger",
-line_abbr: "Ln",
-char_abbr: "Ch",
-position: "Position",
-total: "Total",
-close_popup: "fermer le popup",
-shortcuts: "Racourcis clavier",
-add_tab: "ajouter une tabulation dans le texte",
-remove_tab: "retirer une tabulation dans le texte",
-about_notice: "Note: la coloration syntaxique n'est pr&eacute;vue que pour de courts textes.",
-toggle: "basculer l'&eacute;diteur",
-accesskey: "Accesskey",
-tab: "Tab",
-shift: "Maj",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "chargement...",
-fullscreen: "plein &eacute;cran",
-syntax_selection: "--Syntaxe--",
-close_tab: "Fermer le fichier"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/hr.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/hr.js
deleted file mode 100644
index 0429d3afc..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/hr.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["hr"]={
-new_document: "Novi dokument",
-search_button: "Traži i izmijeni",
-search_command: "Traži dalje / Otvori prozor za traženje",
-search: "Traži",
-replace: "Izmijeni",
-replace_command: "Izmijeni / Otvori prozor za traženje",
-find_next: "Traži dalje",
-replace_all: "Izmjeni sve",
-reg_exp: "Regularni izrazi",
-match_case: "Bitna vel. slova",
-not_found: "nije naðeno.",
-occurrence_replaced: "izmjenjenih.",
-search_field_empty: "Prazno polje za traženje!",
-restart_search_at_begin: "Došao do kraja. Poèeo od poèetka.",
-move_popup: "Pomakni prozor",
-font_size: "--Velièina teksta--",
-go_to_line: "Odi na redak",
-go_to_line_prompt: "Odi na redak:",
-undo: "Vrati natrag",
-redo: "Napravi ponovo",
-change_smooth_selection: "Ukljuèi/iskljuèi neke moguænosti prikaza (pametniji prikaz, ali zagušeniji CPU)",
-highlight: "Ukljuèi/iskljuèi bojanje sintakse",
-reset_highlight: "Ponovi kolorizaciju (ako je nesinkronizirana s tekstom)",
-word_wrap: "toggle word wrapping mode",
-help: "O edit_area",
-save: "Spremi",
-load: "Uèitaj",
-line_abbr: "Ln",
-char_abbr: "Zn",
-position: "Pozicija",
-total: "Ukupno",
-close_popup: "Zatvori prozor",
-shortcuts: "Kratice",
-add_tab: "Dodaj tabulaciju",
-remove_tab: "Makni tabulaciju",
-about_notice: "Napomena: koloriziranje sintakse je samo za kratke kodove",
-toggle: "Prebaci naèin ureðivanja",
-accesskey: "Accesskey",
-tab: "Tab",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "Procesiram...",
-fullscreen: "Cijeli prozor",
-syntax_selection: "--Syntax--",
-close_tab: "Close file"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/it.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/it.js
deleted file mode 100644
index e614367d5..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/it.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["it"]={
-new_document: "nuovo documento vuoto",
-search_button: "cerca e sostituisci",
-search_command: "trova successivo / apri finestra di ricerca",
-search: "cerca",
-replace: "sostituisci",
-replace_command: "sostituisci / apri finestra di ricerca",
-find_next: "trova successivo",
-replace_all: "sostituisci tutti",
-reg_exp: "espressioni regolari",
-match_case: "confronta maiuscole/minuscole<br />",
-not_found: "non trovato.",
-occurrence_replaced: "occorrenze sostituite.",
-search_field_empty: "Campo ricerca vuoto",
-restart_search_at_begin: "Fine del testo raggiunta. Ricomincio dall'inizio.",
-move_popup: "sposta popup di ricerca",
-font_size: "-- Dimensione --",
-go_to_line: "vai alla linea",
-go_to_line_prompt: "vai alla linea numero:",
-undo: "annulla",
-redo: "ripeti",
-change_smooth_selection: "abilita/disabilita alcune caratteristiche della visualizzazione",
-highlight: "abilita/disabilita colorazione della sintassi",
-reset_highlight: "aggiorna colorazione (se non sincronizzata)",
-word_wrap: "toggle word wrapping mode",
-help: "informazioni su...",
-save: "salva",
-load: "carica",
-line_abbr: "Ln",
-char_abbr: "Ch",
-position: "Posizione",
-total: "Totale",
-close_popup: "chiudi popup",
-shortcuts: "Scorciatoie",
-add_tab: "aggiungi tabulazione",
-remove_tab: "rimuovi tabulazione",
-about_notice: "Avviso: la colorazione della sintassi vale solo con testo piccolo",
-toggle: "Abilita/disabilita editor",
-accesskey: "Accesskey",
-tab: "Tab",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "In corso...",
-fullscreen: "fullscreen",
-syntax_selection: "--Syntax--",
-close_tab: "Close file"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/ja.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/ja.js
deleted file mode 100644
index 91b490936..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/ja.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["ja"]={
-new_document: "新規作成",
-search_button: "検索・置換",
-search_command: "次を検索 / 検索窓を表示",
-search: "検索",
-replace: "置換",
-replace_command: "置換 / 置換窓を表示",
-find_next: "次を検索",
-replace_all: "全置換",
-reg_exp: "正規表現",
-match_case: "大文字小文字の区別",
-not_found: "見つかりません。",
-occurrence_replaced: "置換しました。",
-search_field_empty: "検索対象文字列が空です。",
-restart_search_at_begin: "終端に達しました、始めに戻ります",
-move_popup: "検索窓を移動",
-font_size: "--フォントサイズ--",
-go_to_line: "指定行へ移動",
-go_to_line_prompt: "指定行へ移動します:",
-undo: "元に戻す",
-redo: "やり直し",
-change_smooth_selection: "スムース表示の切り替え（CPUを使います）",
-highlight: "構文強調表示の切り替え",
-reset_highlight: "構文強調表示のリセット",
-word_wrap: "toggle word wrapping mode",
-help: "ヘルプを表示",
-save: "保存",
-load: "読み込み",
-line_abbr: "行",
-char_abbr: "文字",
-position: "位置",
-total: "合計",
-close_popup: "ポップアップを閉じる",
-shortcuts: "ショートカット",
-add_tab: "タブを挿入する",
-remove_tab: "タブを削除する",
-about_notice: "注意：構文強調表示は短いテキストでしか有効に機能しません。",
-toggle: "テキストエリアとeditAreaの切り替え",
-accesskey: "アクセスキー",
-tab: "Tab",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "処理中です...",
-fullscreen: "fullscreen",
-syntax_selection: "--Syntax--",
-close_tab: "Close file"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/mk.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/mk.js
deleted file mode 100644
index 4e14d128a..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/mk.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["mk"]={
-new_document: "Нов документ",
-search_button: "Најди и замени",
-search_command: "Барај следно / Отвори нов прозорец за пребарување",
-search: "Барај",
-replace: "Замени",
-replace_command: "Замени / Отвори прозорец за пребарување",
-find_next: "најди следно",
-replace_all: "Замени ги сите",
-reg_exp: "Регуларни изрази",
-match_case: "Битна е големината на буквите",
-not_found: "не е пронајдено.",
-occurrence_replaced: "замени.",
-search_field_empty: "Полето за пребарување е празно",
-restart_search_at_begin: "Крај на областа. Стартувај од почеток.",
-move_popup: "Помести го прозорецот",
-font_size: "--Големина на текстот--",
-go_to_line: "Оди на линија",
-go_to_line_prompt: "Оди на линија со број:",
-undo: "Врати",
-redo: "Повтори",
-change_smooth_selection: "Вклучи/исклучи некои карактеристики за приказ (попаметен приказ, но поголемо оптеретување за процесорот)",
-highlight: "Вклучи/исклучи осветлување на синтакса",
-reset_highlight: "Ресетирај го осветлувањето на синтакса (доколку е десинхронизиранo со текстот)",
-word_wrap: "toggle word wrapping mode",
-help: "За",
-save: "Зачувај",
-load: "Вчитај",
-line_abbr: "Лн",
-char_abbr: "Зн",
-position: "Позиција",
-total: "Вкупно",
-close_popup: "Затвори го прозорецот",
-shortcuts: "Кратенки",
-add_tab: "Додај табулација на текстот",
-remove_tab: "Отстрани ја табулацијата",
-about_notice: "Напомена: Осветлувањето на синтанса е само за краток текст",
-toggle: "Смени начин на уредување",
-accesskey: "Accesskey",
-tab: "Tab",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "Обработувам...",
-fullscreen: "Цел прозорец",
-syntax_selection: "--Синтакса--",
-close_tab: "Избери датотека"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/nl.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/nl.js
deleted file mode 100644
index 84aa17719..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/nl.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["nl"]={
-new_document: "nieuw leeg document",
-search_button: "zoek en vervang",
-search_command: "zoek volgende / zoekscherm openen",
-search: "zoek",
-replace: "vervang",
-replace_command: "vervang / zoekscherm openen",
-find_next: "volgende vinden",
-replace_all: "alles vervangen",
-reg_exp: "reguliere expressies",
-match_case: "hoofdletter gevoelig",
-not_found: "niet gevonden.",
-occurrence_replaced: "object vervangen.",
-search_field_empty: "Zoek veld leeg",
-restart_search_at_begin: "Niet meer instanties gevonden, begin opnieuw",
-move_popup: "versleep zoek scherm",
-font_size: "--Letter grootte--",
-go_to_line: "Ga naar regel",
-go_to_line_prompt: "Ga naar regel nummer:",
-undo: "Ongedaan maken",
-redo: "Opnieuw doen",
-change_smooth_selection: "zet wat schermopties aan/uit (kan langzamer zijn)",
-highlight: "zet syntax highlight aan/uit",
-reset_highlight: "reset highlight (indien gedesynchronizeerd)",
-word_wrap: "toggle word wrapping mode",
-help: "informatie",
-save: "opslaan",
-load: "laden",
-line_abbr: "Ln",
-char_abbr: "Ch",
-position: "Positie",
-total: "Totaal",
-close_popup: "Popup sluiten",
-shortcuts: "Snelkoppelingen",
-add_tab: "voeg tabs toe in tekst",
-remove_tab: "verwijder tabs uit tekst",
-about_notice: "Notitie: syntax highlight functie is alleen voor kleine tekst",
-toggle: "geavanceerde bewerkingsopties",
-accesskey: "Accessknop",
-tab: "Tab",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "Verwerken...",
-fullscreen: "fullscreen",
-syntax_selection: "--Syntax--",
-close_tab: "Close file"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/pl.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/pl.js
deleted file mode 100644
index ae03d6049..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/pl.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["pl"]={
-new_document: "nowy dokument",
-search_button: "znajdź i zamień",
-search_command: "znajdź następny",
-search: "znajdź",
-replace: "zamień",
-replace_command: "zamień",
-find_next: "następny",
-replace_all: "zamień wszystko",
-reg_exp: "wyrażenie regularne",
-match_case: "uwzględnij wielkość liter<br />",
-not_found: "nie znaleziono.",
-occurrence_replaced: "wystąpień zamieniono.",
-search_field_empty: "Nie wprowadzono tekstu",
-restart_search_at_begin: "Koniec dokumentu. Wyszukiwanie od początku.",
-move_popup: "przesuń okienko wyszukiwania",
-font_size: "Rozmiar",
-go_to_line: "idź do linii",
-go_to_line_prompt: "numer linii:",
-undo: "cofnij",
-redo: "przywróć",
-change_smooth_selection: "włącz/wyłącz niektóre opcje wyglądu (zaawansowane opcje wyglądu obciążają procesor)",
-highlight: "włącz/wyłącz podświetlanie składni",
-reset_highlight: "odśwież podświetlanie składni (jeśli rozsynchronizowało się z tekstem)",
-word_wrap: "toggle word wrapping mode",
-help: "o programie",
-save: "zapisz",
-load: "otwórz",
-line_abbr: "Ln",
-char_abbr: "Zn",
-position: "Pozycja",
-total: "W sumie",
-close_popup: "zamknij okienko",
-shortcuts: "Skróty klawiaturowe",
-add_tab: "dodaj wcięcie do zaznaczonego tekstu",
-remove_tab: "usuń wcięcie",
-about_notice: "Uwaga: podświetlanie składni nie jest zalecane dla długich tekstów",
-toggle: "Włącz/wyłącz edytor",
-accesskey: "Alt+",
-tab: "Tab",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "Przetwarzanie...",
-fullscreen: "fullscreen",
-syntax_selection: "--Syntax--",
-close_tab: "Close file"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/pt.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/pt.js
deleted file mode 100644
index d785ec124..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/pt.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["pt"]={
-new_document: "Novo documento",
-search_button: "Localizar e substituir",
-search_command: "Localizar próximo",
-search: "Localizar",
-replace: "Substituir",
-replace_command: "Substituir",
-find_next: "Localizar",
-replace_all: "Subst. tudo",
-reg_exp: "Expressões regulares",
-match_case: "Diferenciar maiúsculas e minúsculas",
-not_found: "Não encontrado.",
-occurrence_replaced: "Ocorrências substituidas",
-search_field_empty: "Campo localizar vazio.",
-restart_search_at_begin: "Fim das ocorrências. Recomeçar do inicio.",
-move_popup: "Mover janela",
-font_size: "--Tamanho da fonte--",
-go_to_line: "Ir para linha",
-go_to_line_prompt: "Ir para a linha:",
-undo: "Desfazer",
-redo: "Refazer",
-change_smooth_selection: "Opções visuais",
-highlight: "Cores de sintaxe",
-reset_highlight: "Resetar cores (se não sincronizado)",
-word_wrap: "toggle word wrapping mode",
-help: "Sobre",
-save: "Salvar",
-load: "Carregar",
-line_abbr: "Ln",
-char_abbr: "Ch",
-position: "Posição",
-total: "Total",
-close_popup: "Fechar",
-shortcuts: "Shortcuts",
-add_tab: "Adicionar tabulação",
-remove_tab: "Remover tabulação",
-about_notice: "Atenção: Cores de sintaxe são indicados somente para textos pequenos",
-toggle: "Exibir editor",
-accesskey: "Accesskey",
-tab: "Tab",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "Processando...",
-fullscreen: "fullscreen",
-syntax_selection: "--Syntax--",
-close_tab: "Close file"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/ru.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/ru.js
deleted file mode 100644
index 081e6b08e..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/ru.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["ru"]={
-new_document: "новый пустой документ",
-search_button: "поиск и замена",
-search_command: "искать следующий / открыть панель поиска",
-search: "поиск",
-replace: "замена",
-replace_command: "заменить / открыть панель поиска",
-find_next: "найти следующее",
-replace_all: "заменить все",
-reg_exp: "регулярное выражение",
-match_case: "учитывать регистр",
-not_found: "не найдено.",
-occurrence_replaced: "вхождение заменено.",
-search_field_empty: "Поле поиска пустое",
-restart_search_at_begin: "Достигнут конец документа. Начинаю с начала.",
-move_popup: "переместить окно поиска",
-font_size: "--Размер шрифта--",
-go_to_line: "перейти к строке",
-go_to_line_prompt: "перейти к строке номер:",
-undo: "отменить",
-redo: "вернуть",
-change_smooth_selection: "включить/отключить некоторые функции просмотра (более красиво, но больше использует процессор)",
-highlight: "переключить подсветку синтаксиса включена/выключена",
-reset_highlight: "восстановить подсветку (если разсинхронизирована от текста)",
-word_wrap: "toggle word wrapping mode",
-help: "о программе",
-save: "сохранить",
-load: "загрузить",
-line_abbr: "Стр",
-char_abbr: "Стлб",
-position: "Позиция",
-total: "Всего",
-close_popup: "закрыть всплывающее окно",
-shortcuts: "Горячие клавиши",
-add_tab: "добавить табуляцию в текст",
-remove_tab: "убрать табуляцию из текста",
-about_notice: "Внимание: функция подсветки синтаксиса только для небольших текстов",
-toggle: "Переключить редактор",
-accesskey: "Горячая клавиша",
-tab: "Tab",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "Обработка...",
-fullscreen: "полный экран",
-syntax_selection: "--Синтакс--",
-close_tab: "Закрыть файл"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/sk.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/sk.js
deleted file mode 100644
index c0b95c308..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/sk.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["sk"]={
-new_document: "nový prázdy dokument",
-search_button: "vyhľadaj a nahraď",
-search_command: "hľadaj ďalsšie / otvor vyhľadávacie pole",
-search: "hľadaj",
-replace: "nahraď",
-replace_command: "nahraď / otvor vyhľadávacie pole",
-find_next: "nájdi ďalšie",
-replace_all: "nahraď všetko",
-reg_exp: "platné výrazy",
-match_case: "zhodujúce sa výrazy",
-not_found: "nenájdené.",
-occurrence_replaced: "výskyty nahradené.",
-search_field_empty: "Pole vyhľadávanie je prádzne",
-restart_search_at_begin: "End of area reached. Restart at begin.",
-move_popup: "presuň vyhľadávacie okno",
-font_size: "--Veľkosť textu--",
-go_to_line: "prejdi na riadok",
-go_to_line_prompt: "prejdi na riadok:",
-undo: "krok späť",
-redo: "prepracovať",
-change_smooth_selection: "povoliť/zamietnúť niektoré zo zobrazených funkcií (účelnejšie zobrazenie vyžaduje  väčšie zaťaženie procesora CPU)",
-highlight: "prepnúť zvýrazňovanie syntaxe zap/vyp",
-reset_highlight: "zrušiť zvýrazňovanie (ak je nesynchronizované s textom)",
-word_wrap: "toggle word wrapping mode",
-help: "o programe",
-save: "uložiť",
-load: "načítať",
-line_abbr: "Ln",
-char_abbr: "Ch",
-position: "Pozícia",
-total: "Spolu",
-close_popup: "zavrieť okno",
-shortcuts: "Skratky",
-add_tab: "pridať tabulovanie textu",
-remove_tab: "odstrániť tabulovanie textu",
-about_notice: "Upozornenie: funkcia zvýrazňovania syntaxe je dostupná iba pre malý text",
-toggle: "Prepnúť editor",
-accesskey: "Accesskey",
-tab: "Záložka",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "Spracúvam...",
-fullscreen: "cel=a obrazovka",
-syntax_selection: "--Vyber Syntax--",
-close_tab: "Close file"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/zh.js b/client/client-editor/src/main/resources/webapp/js/edit_area/langs/zh.js
deleted file mode 100644
index e51c5320d..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/langs/zh.js
+++ /dev/null
@@ -1,48 +0,0 @@
-editAreaLoader.lang["zh"]={
-new_document: "新建空白文档",
-search_button: "查找与替换",
-search_command: "查找下一个 / 打开查找框",
-search: "查找",
-replace: "替换",
-replace_command: "替换 / 打开查找框",
-find_next: "查找下一个",
-replace_all: "全部替换",
-reg_exp: "正则表达式",
-match_case: "匹配大小写",
-not_found: "未找到.",
-occurrence_replaced: "处被替换.",
-search_field_empty: "查找框没有内容",
-restart_search_at_begin: "已到到文档末尾. 从头重新查找.",
-move_popup: "移动查找对话框",
-font_size: "--字体大小--",
-go_to_line: "转到行",
-go_to_line_prompt: "转到行:",
-undo: "恢复",
-redo: "重做",
-change_smooth_selection: "启用/禁止一些显示特性(更好看但更耗费资源)",
-highlight: "启用/禁止语法高亮",
-reset_highlight: "重置语法高亮(当文本显示不同步时)",
-word_wrap: "toggle word wrapping mode",
-help: "关于",
-save: "保存",
-load: "加载",
-line_abbr: "行",
-char_abbr: "字符",
-position: "位置",
-total: "总计",
-close_popup: "关闭对话框",
-shortcuts: "快捷键",
-add_tab: "添加制表符(Tab)",
-remove_tab: "移除制表符(Tab)",
-about_notice: "注意：语法高亮功能仅用于较少内容的文本(文件内容太大会导致浏览器反应慢)",
-toggle: "切换编辑器",
-accesskey: "快捷键",
-tab: "Tab",
-shift: "Shift",
-ctrl: "Ctrl",
-esc: "Esc",
-processing: "正在处理中...",
-fullscreen: "全屏编辑",
-syntax_selection: "--语法--",
-close_tab: "关闭文件"
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/license_apache.txt b/client/client-editor/src/main/resources/webapp/js/edit_area/license_apache.txt
deleted file mode 100644
index 38311718e..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/license_apache.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright 2008 Christophe Dolivet
-
-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.
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/basic.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/basic.js
deleted file mode 100644
index 96ccc5b8f..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/basic.js
+++ /dev/null
@@ -1,70 +0,0 @@
-editAreaLoader.load_syntax["basic"] = {
-	'DISPLAY_NAME' : 'Basic'
-	,'COMMENT_SINGLE' : {1 : "'", 2 : 'rem'}
-	,'COMMENT_MULTI' : { }
-	,'QUOTEMARKS' : {1: '"'}
-	,'KEYWORD_CASE_SENSITIVE' : false
-	,'KEYWORDS' : {
-		'statements' : [
-			'if','then','for','wend','while',
-			'else','elseif','select','case','end select',
-			'until','next','step','to','end if', 'call'
-		]
-		,'keywords' : [
-			'sub', 'end sub', 'function', 'end function', 'exit',
-			'exit function', 'dim', 'redim', 'shared', 'const',
-			'is', 'absolute', 'access', 'any', 'append', 'as',
-			'base', 'beep', 'binary', 'bload', 'bsave', 'chain',
-			'chdir', 'circle', 'clear', 'close', 'cls', 'color',
-			'com', 'common', 'data', 'date', 'declare', 'def',
-			'defdbl', 'defint', 'deflng', 'defsng', 'defstr',
-			'double', 'draw', 'environ', 'erase', 'error', 'field',
-			'files', 'fn', 'get', 'gosub', 'goto', 'integer', 'key',
-			'kill', 'let', 'line', 'list', 'locate', 'lock', 'long',
-			'lprint', 'lset', 'mkdir', 'name', 'off', 'on', 'open',
-			'option', 'out', 'output', 'paint', 'palette', 'pcopy',
-			'poke', 'preset', 'print', 'pset', 'put', 'random',
-			'randomize', 'read', 'reset', 'restore', 'resume',
-			'return', 'rmdir', 'rset', 'run', 'screen', 'seg',
-			'shell', 'single', 'sleep', 'sound', 'static', 'stop',
-			'strig', 'string', 'swap', 'system', 'time', 'timer',
-			'troff', 'tron', 'type', 'unlock', 'using', 'view',
-			'wait', 'width', 'window', 'write'
-	        ]
-		,'functions' : [
-			'abs', 'asc', 'atn', 'cdbl', 'chr', 'cint', 'clng',
-			'cos', 'csng', 'csrlin', 'cvd', 'cvdmbf', 'cvi', 'cvl',
-			'cvs', 'cvsmbf', 'eof', 'erdev', 'erl', 'err', 'exp',
-			'fileattr', 'fix', 'fre', 'freefile', 'hex', 'inkey',
-			'inp', 'input', 'instr', 'int', 'ioctl', 'lbound',
-			'lcase', 'left', 'len', 'loc', 'lof', 'log', 'lpos',
-			'ltrim', 'mid', 'mkd', 'mkdmbf', 'mki', 'mkl', 'mks',
-			'mksmbf', 'oct', 'peek', 'pen', 'play', 'pmap', 'point',
-			'pos', 'right', 'rnd', 'rtrim', 'seek', 'sgn', 'sin',
-			'space', 'spc', 'sqr', 'stick', 'str', 'tab', 'tan',
-			'ubound', 'ucase', 'val', 'varptr', 'varseg'
-		]
-		,'operators' : [
-			'and', 'eqv', 'imp', 'mod', 'not', 'or', 'xor'
-		]
-	}
-	,'OPERATORS' :[
-		'+', '-', '/', '*', '=', '<', '>', '!', '&'
-	]
-	,'DELIMITERS' :[
-		'(', ')', '[', ']', '{', '}'
-	]
-	,'STYLES' : {
-		'COMMENTS': 'color: #99CC00;'
-		,'QUOTESMARKS': 'color: #333399;'
-		,'KEYWORDS' : {
-			'keywords' : 'color: #3366FF;'
-			,'functions' : 'color: #0000FF;'
-			,'statements' : 'color: #3366FF;'
-			,'operators' : 'color: #FF0000;'
-			}
-		,'OPERATORS' : 'color: #FF0000;'
-		,'DELIMITERS' : 'color: #0000FF;'
-
-	}
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/brainfuck.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/brainfuck.js
deleted file mode 100644
index e6306b0c3..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/brainfuck.js
+++ /dev/null
@@ -1,45 +0,0 @@
-editAreaLoader.load_syntax["brainfuck"] = {
-	'DISPLAY_NAME' : 'Brainfuck'
-	,'COMMENT_SINGLE' : {}
-	,'COMMENT_MULTI' : {}
-	,'QUOTEMARKS' : {}
-	,'KEYWORD_CASE_SENSITIVE' : true
-	,'OPERATORS' :[
-		'+', '-'
-	]
-	,'DELIMITERS' :[
-		'[', ']'
-	]
-	,'REGEXPS' : {
-		'bfispis' : {
-			'search' : '()(\\.)()'
-			,'class' : 'bfispis'
-			,'modifiers' : 'g'
-			,'execute' : 'before'
-		}
-		,'bfupis' : {
-			'search' : '()(\\,)()'
-			,'class' : 'bfupis'
-			,'modifiers' : 'g'
-			,'execute' : 'before'
-		}
-		,'bfmemory' : {
-			'search' : '()([<>])()'
-			,'class' : 'bfmemory'
-			,'modifiers' : 'g'
-			,'execute' : 'before'
-		}
-	}
-	,'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;'
-		,'QUOTESMARKS': 'color: #6381F8;'
-		,'OPERATORS' : 'color: #88AA00;'
-		,'DELIMITERS' : 'color: #00C138;'
-		,'REGEXPS' : {
-			'bfispis' : 'color: #EE0000;'
-			,'bfupis' : 'color: #4455ee;'
-			,'bfmemory' : 'color: #DD00DD;'
-		}
-	}
-};
-
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/c.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/c.js
deleted file mode 100644
index 05d978c77..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/c.js
+++ /dev/null
@@ -1,63 +0,0 @@
-editAreaLoader.load_syntax["c"] = {
-	'DISPLAY_NAME' : 'C'
-	,'COMMENT_SINGLE' : {1 : '//'}
-	,'COMMENT_MULTI' : {'/*' : '*/'}
-	,'QUOTEMARKS' : {1: "'", 2: '"'}
-	,'KEYWORD_CASE_SENSITIVE' : true
-	,'KEYWORDS' : {
-		'constants' : [
-			'NULL', 'false', 'stdin', 'stdout', 'stderr', 'true'
-		]
-		,'types' : [
-			'FILE', 'auto', 'char', 'const', 'double',
-			'extern', 'float', 'inline', 'int', 'long', 'register',
-			'short', 'signed', 'size_t', 'static', 'struct',
-			'time_t', 'typedef', 'union', 'unsigned', 'void',
-			'volatile'
-		]
-		,'statements' : [
-			'do', 'else', 'enum', 'for', 'goto', 'if', 'sizeof',
-			'switch', 'while'
-		]
- 		,'keywords' : [
-			'break', 'case', 'continue', 'default', 'delete',
-			'return'
-		]
-	}
-	,'OPERATORS' :[
-		'+', '-', '/', '*', '=', '<', '>', '%', '!', '?', ':', '&'
-	]
-	,'DELIMITERS' :[
-		'(', ')', '[', ']', '{', '}'
-	]
-	,'REGEXPS' : {
-		'precompiler' : {
-			'search' : '()(#[^\r\n]*)()'
-			,'class' : 'precompiler'
-			,'modifiers' : 'g'
-			,'execute' : 'before'
-		}
-/*		,'precompilerstring' : {
-			'search' : '(#[\t ]*include[\t ]*)([^\r\n]*)([^\r\n]*[\r\n])'
-			,'class' : 'precompilerstring'
-			,'modifiers' : 'g'
-			,'execute' : 'before'
-		}*/
-	}
-	,'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;'
-		,'QUOTESMARKS': 'color: #6381F8;'
-		,'KEYWORDS' : {
-			'constants' : 'color: #EE0000;'
-			,'types' : 'color: #0000EE;'
-			,'statements' : 'color: #60CA00;'
-			,'keywords' : 'color: #48BDDF;'
-		}
-		,'OPERATORS' : 'color: #FF00FF;'
-		,'DELIMITERS' : 'color: #0038E1;'
-		,'REGEXPS' : {
-			'precompiler' : 'color: #009900;'
-			,'precompilerstring' : 'color: #994400;'
-		}
-	}
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/coldfusion.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/coldfusion.js
deleted file mode 100644
index d70657f6a..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/coldfusion.js
+++ /dev/null
@@ -1,120 +0,0 @@
-editAreaLoader.load_syntax["coldfusion"] = {
-	'DISPLAY_NAME' : 'Coldfusion'
-	,'COMMENT_SINGLE' : {1 : '//', 2 : '#'}
-	,'COMMENT_MULTI' : {'<!--' : '-->'}
-	,'COMMENT_MULTI2' : {'<!---' : '--->'}
-	,'QUOTEMARKS' : {1: "'", 2: '"'}
-	,'KEYWORD_CASE_SENSITIVE' : false
-		,'KEYWORDS' : {
-		'statements' : [
-			'include', 'require', 'include_once', 'require_once',
-			'for', 'foreach', 'as', 'if', 'elseif', 'else', 'while', 'do', 'endwhile',
-            'endif', 'switch', 'case', 'endswitch',
-			'return', 'break', 'continue'
-		]
-		,'reserved' : [
-			'AND', 'break', 'case', 'CONTAIN', 'CONTAINS', 'continue', 'default', 'do', 
-			'DOES', 'else', 'EQ', 'EQUAL', 'EQUALTO', 'EQV', 'FALSE', 'for', 'GE', 
-			'GREATER', 'GT', 'GTE', 'if', 'IMP', 'in', 'IS', 'LE', 'LESS', 'LT', 'LTE', 
-			'MOD', 'NEQ', 'NOT', 'OR', 'return', 'switch', 'THAN', 'TO', 'TRUE', 'var', 
-			'while', 'XOR'
-		]
-		,'functions' : [
-			'Abs', 'ACos', 'ArrayAppend', 'ArrayAvg', 'ArrayClear', 'ArrayDeleteAt', 'ArrayInsertAt', 
-			'ArrayIsEmpty', 'ArrayLen', 'ArrayMax', 'ArrayMin', 'ArrayNew', 'ArrayPrepend', 'ArrayResize', 
-			'ArraySet', 'ArraySort', 'ArraySum', 'ArraySwap', 'ArrayToList', 'Asc', 'ASin', 'Atn', 'AuthenticatedContext', 
-			'AuthenticatedUser', 'BitAnd', 'BitMaskClear', 'BitMaskRead', 'BitMaskSet', 'BitNot', 'BitOr', 
-			'BitSHLN', 'BitSHRN', 'BitXor', 'Ceiling', 'Chr', 'CJustify', 'Compare', 'CompareNoCase', 'Cos', 
-			'CreateDate', 'CreateDateTime', 'CreateODBCDate', 'CreateODBCDateTime', 'CreateODBCTime', 
-			'CreateTime', 'CreateTimeSpan', 'DateAdd', 'DateCompare', 'DateConvert', 'DateDiff', 
-			'DateFormat', 'DatePart', 'Day', 'DayOfWeek', 'DayOfWeekAsString', 'DayOfYear', 'DaysInMonth', 
-			'DaysInYear', 'DE', 'DecimalFormat', 'DecrementValue', 'Decrypt', 'DeleteClientVariable', 
-			'DirectoryExists', 'DollarFormat', 'Duplicate', 'Encrypt', 'Evaluate', 'Exp', 'ExpandPath', 
-			'FileExists', 'Find', 'FindNoCase', 'FindOneOf', 'FirstDayOfMonth', 'Fix', 'FormatBaseN', 
-			'GetBaseTagData', 'GetBaseTagList', 'GetBaseTemplatePath', 'GetClientVariablesList', 
-			'GetCurrentTemplatePath', 'GetDirectoryFromPath', 'GetException', 'GetFileFromPath', 
-			'GetFunctionList', 'GetHttpTimeString', 'GetHttpRequestData', 'GetLocale', 'GetMetricData', 
-			'GetProfileString', 'GetTempDirectory', 'GetTempFile', 'GetTemplatePath', 'GetTickCount', 
-			'GetTimeZoneInfo', 'GetToken', 'Hash', 'Hour', 'HTMLCodeFormat', 'HTMLEditFormat', 'IIf', 
-			'IncrementValue', 'InputBaseN', 'Insert', 'Int', 'IsArray', 'IsAuthenticated', 'IsAuthorized', 
-			'IsBoolean', 'IsBinary', 'IsCustomFunction', 'IsDate', 'IsDebugMode', 'IsDefined', 'IsLeapYear', 
-			'IsNumeric', 'IsNumericDate', 'IsProtected', 'IsQuery', 'IsSimpleValue', 'IsStruct', 'IsWDDX', 
-			'JavaCast', 'JSStringFormat', 'LCase', 'Left', 'Len', 'ListAppend', 'ListChangeDelims', 
-			'ListContains', 'ListContainsNoCase', 'ListDeleteAt', 'ListFind', 'ListFindNoCase', 'ListFirst', 
-			'ListGetAt', 'ListInsertAt', 'ListLast', 'ListLen', 'ListPrepend', 'ListQualify', 'ListRest', 
-			'ListSetAt', 'ListSort', 'ListToArray', 'ListValueCount', 'ListValueCountNoCase', 'LJustify', 
-			'Log', 'Log10', 'LSCurrencyFormat', 'LSDateFormat', 'LSEuroCurrencyFormat', 'LSIsCurrency', 
-			'LSIsDate', 'LSIsNumeric', 'LSNumberFormat', 'LSParseCurrency', 'LSParseDateTime', 'LSParseNumber', 
-			'LSTimeFormat', 'LTrim', 'Max', 'Mid', 'Min', 'Minute', 'Month', 'MonthAsString', 'Now', 'NumberFormat', 
-			'ParagraphFormat', 'ParameterExists', 'ParseDateTime', 'Pi', 'PreserveSingleQuotes', 'Quarter', 
-			'QueryAddRow', 'QueryNew', 'QuerySetCell', 'QuotedValueList', 'Rand', 'Randomize', 'RandRange', 
-			'REFind', 'REFindNoCase', 'RemoveChars', 'RepeatString', 'Replace', 'ReplaceList', 'ReplaceNoCase', 
-			'REReplace', 'REReplaceNoCase', 'Reverse', 'Right', 'RJustify', 'Round', 'RTrim', 'Second', 'SetLocale', 
-			'SetProfileString', 'SetVariable', 'Sgn', 'Sin', 'SpanExcluding', 'SpanIncluding', 'Sqr', 'StripCR', 
-			'StructAppend', 'StructClear', 'StructCopy', 'StructCount', 'StructDelete', 'StructFind', 'StructFindKey', 
-			'StructFindValue', 'StructGet', 'StructInsert', 'StructIsEmpty', 'StructKeyArray', 'StructKeyExists', 
-			'StructKeyList', 'StructNew', 'StructSort', 'StructUpdate', 'Tan', 'TimeFormat', 'ToBase64', 'ToBinary', 
-			'ToString', 'Trim', 'UCase', 'URLDecode', 'URLEncodedFormat', 'Val', 'ValueList', 'Week', 'WriteOutput', 
-			'XMLFormat', 'Year', 'YesNoFormat'
-		]
-	}
-	,'OPERATORS' :[
-		'+', '-', '/', '*', '%', '!', '&&', '||'
-	]
-	,'DELIMITERS' :[
-		'(', ')', '[', ']', '{', '}'
-	]
-	,'REGEXPS' : {
-		'doctype' : {
-			'search' : '()(<!DOCTYPE[^>]*>)()'
-			,'class' : 'doctype'
-			,'modifiers' : ''
-			,'execute' : 'before' // before or after
-		}
-		,'cftags' : {
-			'search' : '(<)(/cf[a-z][^ \r\n\t>]*)([^>]*>)'
-			,'class' : 'cftags'
-			,'modifiers' : 'gi'
-			,'execute' : 'before' // before or after
-		}
-		,'cftags2' : {
-			'search' : '(<)(cf[a-z][^ \r\n\t>]*)([^>]*>)'
-			,'class' : 'cftags2'
-			,'modifiers' : 'gi'
-			,'execute' : 'before' // before or after
-		}
-		,'tags' : {
-			'search' : '(<)(/?[a-z][^ \r\n\t>]*)([^>]*>)'
-			,'class' : 'tags'
-			,'modifiers' : 'gi'
-			,'execute' : 'before' // before or after
-		}
-		,'attributes' : {
-			'search' : '( |\n|\r|\t)([^ \r\n\t=]+)(=)'
-			,'class' : 'attributes'
-			,'modifiers' : 'g'
-			,'execute' : 'before' // before or after
-		}
-	}
-	,'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;'
-		,'QUOTESMARKS': 'color: #6381F8;'
-		,'KEYWORDS' : {
-			'reserved' : 'color: #48BDDF;'
-			,'functions' : 'color: #0000FF;'
-			,'statements' : 'color: #60CA00;'
-			}
-		,'OPERATORS' : 'color: #E775F0;'
-		,'DELIMITERS' : ''
-		,'REGEXPS' : {
-			'attributes': 'color: #990033;'
-			,'cftags': 'color: #990033;'
-			,'cftags2': 'color: #990033;'
-			,'tags': 'color: #000099;'
-			,'doctype': 'color: #8DCFB5;'
-			,'test': 'color: #00FF00;'
-		}	
-	}		
-};
-
- 	  	 
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/cpp.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/cpp.js
deleted file mode 100644
index 98e649347..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/cpp.js
+++ /dev/null
@@ -1,66 +0,0 @@
-editAreaLoader.load_syntax["cpp"] = {
-	'DISPLAY_NAME' : 'CPP'
-	,'COMMENT_SINGLE' : {1 : '//'}
-	,'COMMENT_MULTI' : {'/*' : '*/'}
-	,'QUOTEMARKS' : {1: "'", 2: '"'}
-	,'KEYWORD_CASE_SENSITIVE' : true
-	,'KEYWORDS' : {
-		'constants' : [
-			'NULL', 'false', 'std', 'stdin', 'stdout', 'stderr',
-			'true'
-		]
-		,'types' : [
-			'FILE', 'auto', 'char', 'class', 'const', 'double',
-			'extern', 'float', 'friend', 'inline', 'int',
-			'iterator', 'long', 'map', 'operator', 'queue',
-			'register', 'short', 'signed', 'size_t', 'stack',
-			'static', 'string', 'struct', 'time_t', 'typedef',
-			'union', 'unsigned', 'vector', 'void', 'volatile'
-		]
-		,'statements' : [
-			'catch', 'do', 'else', 'enum', 'for', 'goto', 'if',
-			'sizeof', 'switch', 'this', 'throw', 'try', 'while'
-		]
- 		,'keywords' : [
-			'break', 'case', 'continue', 'default', 'delete',
-			'namespace', 'new', 'private', 'protected', 'public',
-			'return', 'using'
-		]
-	}
-	,'OPERATORS' :[
-		'+', '-', '/', '*', '=', '<', '>', '%', '!', '?', ':', '&'
-	]
-	,'DELIMITERS' :[
-		'(', ')', '[', ']', '{', '}'
-	]
-	,'REGEXPS' : {
-		'precompiler' : {
-			'search' : '()(#[^\r\n]*)()'
-			,'class' : 'precompiler'
-			,'modifiers' : 'g'
-			,'execute' : 'before'
-		}
-/*		,'precompilerstring' : {
-			'search' : '(#[\t ]*include[\t ]*)([^\r\n]*)([^\r\n]*[\r\n])'
-			,'class' : 'precompilerstring'
-			,'modifiers' : 'g'
-			,'execute' : 'before'
-		}*/
-	}
-	,'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;'
-		,'QUOTESMARKS': 'color: #6381F8;'
-		,'KEYWORDS' : {
-			'constants' : 'color: #EE0000;'
-			,'types' : 'color: #0000EE;'
-			,'statements' : 'color: #60CA00;'
-			,'keywords' : 'color: #48BDDF;'
-		}
-		,'OPERATORS' : 'color: #FF00FF;'
-		,'DELIMITERS' : 'color: #0038E1;'
-		,'REGEXPS' : {
-			'precompiler' : 'color: #009900;'
-			,'precompilerstring' : 'color: #994400;'
-		}
-	}
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/css.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/css.js
deleted file mode 100644
index cff605aad..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/css.js
+++ /dev/null
@@ -1,85 +0,0 @@
-editAreaLoader.load_syntax["css"] = {
-	'DISPLAY_NAME' : 'CSS'
-	,'COMMENT_SINGLE' : {1 : '@'}
-	,'COMMENT_MULTI' : {'/*' : '*/'}
-	,'QUOTEMARKS' : ['"', "'"]
-	,'KEYWORD_CASE_SENSITIVE' : false
-	,'KEYWORDS' : {
-		'attributes' : [
-			'aqua', 'azimuth', 'background-attachment', 'background-color',
-			'background-image', 'background-position', 'background-repeat',
-			'background', 'border-bottom-color', 'border-bottom-style',
-			'border-bottom-width', 'border-left-color', 'border-left-style',
-			'border-left-width', 'border-right', 'border-right-color',
-			'border-right-style', 'border-right-width', 'border-top-color',
-			'border-top-style', 'border-top-width','border-bottom', 'border-collapse',
-			'border-left', 'border-width', 'border-color', 'border-spacing',
-			'border-style', 'border-top', 'border',  'caption-side',
-			'clear', 'clip', 'color', 'content', 'counter-increment', 'counter-reset',
-			'cue-after', 'cue-before', 'cue', 'cursor', 'direction', 'display',
-			'elevation', 'empty-cells', 'float', 'font-family', 'font-size',
-			'font-size-adjust', 'font-stretch', 'font-style', 'font-variant',
-			'font-weight', 'font', 'height', 'letter-spacing', 'line-height',
-			'list-style', 'list-style-image', 'list-style-position', 'list-style-type',
-			'margin-bottom', 'margin-left', 'margin-right', 'margin-top', 'margin',
-			'marker-offset', 'marks', 'max-height', 'max-width', 'min-height',
-			'min-width', 'opacity', 'orphans', 'outline', 'outline-color', 'outline-style',
-			'outline-width', 'overflow', 'padding-bottom', 'padding-left',
-			'padding-right', 'padding-top', 'padding', 'page', 'page-break-after',
-			'page-break-before', 'page-break-inside', 'pause-after', 'pause-before',
-			'pause', 'pitch', 'pitch-range',  'play-during', 'position', 'quotes',
-			'richness', 'right', 'size', 'speak-header', 'speak-numeral', 'speak-punctuation',
-			'speak', 'speech-rate', 'stress', 'table-layout', 'text-align', 'text-decoration',
-			'text-indent', 'text-shadow', 'text-transform', 'top', 'unicode-bidi',
-			'vertical-align', 'visibility', 'voice-family', 'volume', 'white-space', 'widows',
-			'width', 'word-spacing', 'z-index', 'bottom', 'left'
-		]
-		,'values' : [
-			'above', 'absolute', 'always', 'armenian', 'aural', 'auto', 'avoid',
-			'baseline', 'behind', 'below', 'bidi-override', 'black', 'blue', 'blink', 'block', 'bold', 'bolder', 'both',
-			'capitalize', 'center-left', 'center-right', 'center', 'circle', 'cjk-ideographic', 
-            'close-quote', 'collapse', 'condensed', 'continuous', 'crop', 'crosshair', 'cross', 'cursive',
-			'dashed', 'decimal-leading-zero', 'decimal', 'default', 'digits', 'disc', 'dotted', 'double',
-			'e-resize', 'embed', 'extra-condensed', 'extra-expanded', 'expanded',
-			'fantasy', 'far-left', 'far-right', 'faster', 'fast', 'fixed', 'fuchsia',
-			'georgian', 'gray', 'green', 'groove', 'hebrew', 'help', 'hidden', 'hide', 'higher',
-			'high', 'hiragana-iroha', 'hiragana', 'icon', 'inherit', 'inline-table', 'inline',
-			'inset', 'inside', 'invert', 'italic', 'justify', 'katakana-iroha', 'katakana',
-			'landscape', 'larger', 'large', 'left-side', 'leftwards', 'level', 'lighter', 'lime', 'line-through', 'list-item', 'loud', 'lower-alpha', 'lower-greek', 'lower-roman', 'lowercase', 'ltr', 'lower', 'low',
-			'maroon', 'medium', 'message-box', 'middle', 'mix', 'monospace',
-			'n-resize', 'narrower', 'navy', 'ne-resize', 'no-close-quote', 'no-open-quote', 'no-repeat', 'none', 'normal', 'nowrap', 'nw-resize',
-			'oblique', 'olive', 'once', 'open-quote', 'outset', 'outside', 'overline',
-			'pointer', 'portrait', 'purple', 'px',
-			'red', 'relative', 'repeat-x', 'repeat-y', 'repeat', 'rgb', 'ridge', 'right-side', 'rightwards',
-			's-resize', 'sans-serif', 'scroll', 'se-resize', 'semi-condensed', 'semi-expanded', 'separate', 'serif', 'show', 'silent', 'silver', 'slow', 'slower', 'small-caps', 'small-caption', 'smaller', 'soft', 'solid', 'spell-out', 'square',
-			'static', 'status-bar', 'super', 'sw-resize',
-			'table-caption', 'table-cell', 'table-column', 'table-column-group', 'table-footer-group', 'table-header-group', 'table-row', 'table-row-group', 'teal', 'text', 'text-bottom', 'text-top', 'thick', 'thin', 'transparent',
-			'ultra-condensed', 'ultra-expanded', 'underline', 'upper-alpha', 'upper-latin', 'upper-roman', 'uppercase', 'url',
-			'visible',
-			'w-resize', 'wait', 'white', 'wider',
-			'x-fast', 'x-high', 'x-large', 'x-loud', 'x-low', 'x-small', 'x-soft', 'xx-large', 'xx-small',
-			'yellow', 'yes'
-		]
-		,'specials' : [
-			'important'
-		]
-	}
-	,'OPERATORS' :[
-		':', ';', '!', '.', '#'
-	]
-	,'DELIMITERS' :[
-		'{', '}'
-	]
-	,'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;'
-		,'QUOTESMARKS': 'color: #6381F8;'
-		,'KEYWORDS' : {
-			'attributes' : 'color: #48BDDF;'
-			,'values' : 'color: #2B60FF;'
-			,'specials' : 'color: #FF0000;'
-			}
-		,'OPERATORS' : 'color: #FF00FF;'
-		,'DELIMITERS' : 'color: #60CA00;'
-				
-	}
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/html.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/html.js
deleted file mode 100644
index 66490b171..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/html.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* last update: 2006-08-24
-*/
-
-editAreaLoader.load_syntax["html"] = {
-	'DISPLAY_NAME' : 'HTML'
-	,'COMMENT_SINGLE' : {}
-	,'COMMENT_MULTI' : {'<!--' : '-->'}
-	,'QUOTEMARKS' : {1: "'", 2: '"'}
-	,'KEYWORD_CASE_SENSITIVE' : false
-	,'KEYWORDS' : {
-	}
-	,'OPERATORS' :[
-	]
-	,'DELIMITERS' :[
-	]
-	,'REGEXPS' : {
-		'doctype' : {
-			'search' : '()(<!DOCTYPE[^>]*>)()'
-			,'class' : 'doctype'
-			,'modifiers' : ''
-			,'execute' : 'before' // before or after
-		}
-		,'tags' : {
-			'search' : '(<)(/?[a-z][^ \r\n\t>]*)([^>]*>)'
-			,'class' : 'tags'
-			,'modifiers' : 'gi'
-			,'execute' : 'before' // before or after
-		}
-		,'attributes' : {
-			'search' : '( |\n|\r|\t)([^ \r\n\t=]+)(=)'
-			,'class' : 'attributes'
-			,'modifiers' : 'g'
-			,'execute' : 'before' // before or after
-		}
-	}
-	,'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;'
-		,'QUOTESMARKS': 'color: #6381F8;'
-		,'KEYWORDS' : {
-			}
-		,'OPERATORS' : 'color: #E775F0;'
-		,'DELIMITERS' : ''
-		,'REGEXPS' : {
-			'attributes': 'color: #B1AC41;'
-			,'tags': 'color: #E62253;'
-			,'doctype': 'color: #8DCFB5;'
-			,'test': 'color: #00FF00;'
-		}	
-	}		
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/java.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/java.js
deleted file mode 100644
index e14009bfd..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/java.js
+++ /dev/null
@@ -1,57 +0,0 @@
-editAreaLoader.load_syntax["java"] = {
-	'DISPLAY_NAME' : 'Java'
-	,'COMMENT_SINGLE': { 1: '//', 2: '@' }
-	, 'COMMENT_MULTI': { '/*': '*/' }
-	, 'QUOTEMARKS': { 1: "'", 2: '"' }
-	, 'KEYWORD_CASE_SENSITIVE': true
-	, 'KEYWORDS': {
-	    'constants': [
-			'null', 'false', 'true'
-		]
-		, 'types': [
-			'String', 'int', 'short', 'long', 'char', 'double', 'byte',
-			'float', 'static', 'void', 'private', 'boolean', 'protected',
-			'public', 'const', 'class', 'final', 'abstract', 'volatile',
-			'enum', 'transient', 'interface'
-		]
-		, 'statements': [
-            'this', 'extends', 'if', 'do', 'while', 'try', 'catch', 'finally',
-            'throw', 'throws', 'else', 'for', 'switch', 'continue', 'implements',
-            'break', 'case', 'default', 'goto'
-		]
- 		, 'keywords': [
-           'new', 'return', 'import', 'native', 'super', 'package', 'assert', 'synchronized',
-           'instanceof', 'strictfp'
-		]
-	}
-	, 'OPERATORS': [
-		'+', '-', '/', '*', '=', '<', '>', '%', '!', '?', ':', '&'
-	]
-	, 'DELIMITERS': [
-		'(', ')', '[', ']', '{', '}'
-	]
-	, 'REGEXPS': {
-	    'precompiler': {
-	        'search': '()(#[^\r\n]*)()'
-			, 'class': 'precompiler'
-			, 'modifiers': 'g'
-			, 'execute': 'before'
-	    }
-	}
-	, 'STYLES': {
-	    'COMMENTS': 'color: #AAAAAA;'
-		, 'QUOTESMARKS': 'color: #6381F8;'
-		, 'KEYWORDS': {
-		    'constants': 'color: #EE0000;'
-			, 'types': 'color: #0000EE;'
-			, 'statements': 'color: #60CA00;'
-			, 'keywords': 'color: #48BDDF;'
-		}
-		, 'OPERATORS': 'color: #FF00FF;'
-		, 'DELIMITERS': 'color: #0038E1;'
-		, 'REGEXPS': {
-		    'precompiler': 'color: #009900;'
-			, 'precompilerstring': 'color: #994400;'
-		}
-	}
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/js.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/js.js
deleted file mode 100644
index 556566bd5..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/js.js
+++ /dev/null
@@ -1,94 +0,0 @@
-editAreaLoader.load_syntax["js"] = {
-	'DISPLAY_NAME' : 'Javascript'
-	,'COMMENT_SINGLE' : {1 : '//'}
-	,'COMMENT_MULTI' : {'/*' : '*/'}
-	,'QUOTEMARKS' : {1: "'", 2: '"'}
-	,'KEYWORD_CASE_SENSITIVE' : false
-	,'KEYWORDS' : {
-		'statements' : [
-			'as', 'break', 'case', 'catch', 'continue', 'decodeURI', 'delete', 'do',
-			'else', 'encodeURI', 'eval', 'finally', 'for', 'if', 'in', 'is', 'item',
-			'instanceof', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'void',
-			'while', 'write', 'with'
-		]
- 		,'keywords' : [
-			'class', 'const', 'default', 'debugger', 'export', 'extends', 'false',
-			'function', 'import', 'namespace', 'new', 'null', 'package', 'private',
-			'protected', 'public', 'super', 'true', 'use', 'var', 'window', 'document',		
-			// the list below must be sorted and checked (if it is a keywords or a function and if it is not present twice
-			'Link ', 'outerHeight ', 'Anchor', 'FileUpload', 
-			'location', 'outerWidth', 'Select', 'Area', 'find', 'Location', 'Packages', 'self', 
-			'arguments', 'locationbar', 'pageXoffset', 'Form', 
-			'Math', 'pageYoffset', 'setTimeout', 'assign', 'Frame', 'menubar', 'parent', 'status', 
-			'blur', 'frames', 'MimeType', 'parseFloat', 'statusbar', 'Boolean', 'Function', 'moveBy', 
-			'parseInt', 'stop', 'Button', 'getClass', 'moveTo', 'Password', 'String', 'callee', 'Hidden', 
-			'name', 'personalbar', 'Submit', 'caller', 'history', 'NaN', 'Plugin', 'sun', 'captureEvents', 
-			'History', 'navigate', 'print', 'taint', 'Checkbox', 'home', 'navigator', 'prompt', 'Text', 
-			'Image', 'Navigator', 'prototype', 'Textarea', 'clearTimeout', 'Infinity', 
-			'netscape', 'Radio', 'toolbar', 'close', 'innerHeight', 'Number', 'ref', 'top', 'closed', 
-			'innerWidth', 'Object', 'RegExp', 'toString', 'confirm', 'isFinite', 'onBlur', 'releaseEvents', 
-			'unescape', 'constructor', 'isNan', 'onError', 'Reset', 'untaint', 'Date', 'java', 'onFocus', 
-			'resizeBy', 'unwatch', 'defaultStatus', 'JavaArray', 'onLoad', 'resizeTo', 'valueOf', 'document', 
-			'JavaClass', 'onUnload', 'routeEvent', 'watch', 'Document', 'JavaObject', 'open', 'scroll', 'window', 
-			'Element', 'JavaPackage', 'opener', 'scrollbars', 'Window', 'escape', 'length', 'Option', 'scrollBy'			
-		]
-    	,'functions' : [
-			// common functions for Window object
-			'alert', 'Array', 'back', 'blur', 'clearInterval', 'close', 'confirm', 'eval ', 'focus', 'forward', 'home',
-			'name', 'navigate', 'onblur', 'onerror', 'onfocus', 'onload', 'onmove',
-			'onresize', 'onunload', 'open', 'print', 'prompt', 'scroll', 'scrollTo', 'setInterval', 'status',
-			'stop' 
-		]
-	}
-	,'OPERATORS' :[
-		'+', '-', '/', '*', '=', '<', '>', '%', '!'
-	]
-	,'DELIMITERS' :[
-		'(', ')', '[', ']', '{', '}'
-	]
-	,'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;'
-		,'QUOTESMARKS': 'color: #6381F8;'
-		,'KEYWORDS' : {
-			'statements' : 'color: #60CA00;'
-			,'keywords' : 'color: #48BDDF;'
-			,'functions' : 'color: #2B60FF;'
-		}
-		,'OPERATORS' : 'color: #FF00FF;'
-		,'DELIMITERS' : 'color: #0038E1;'
-				
-	}
-	,'AUTO_COMPLETION' :  {
-		"default": {	// the name of this definition group. It's posisble to have different rules inside the same definition file
-			"REGEXP": { "before_word": "[^a-zA-Z0-9_]|^"	// \\s|\\.|
-						,"possible_words_letters": "[a-zA-Z0-9_]+"
-						,"letter_after_word_must_match": "[^a-zA-Z0-9_]|$"
-						,"prefix_separator": "\\."
-					}
-			,"CASE_SENSITIVE": true
-			,"MAX_TEXT_LENGTH": 100		// the maximum length of the text being analyzed before the cursor position
-			,"KEYWORDS": {
-				'': [	// the prefix of thoses items
-						/**
-						 * 0 : the keyword the user is typing
-						 * 1 : (optionnal) the string inserted in code ("{@}" being the new position of the cursor, "§" beeing the equivalent to the value the typed string indicated if the previous )
-						 * 		If empty the keyword will be displayed
-						 * 2 : (optionnal) the text that appear in the suggestion box (if empty, the string to insert will be displayed)
-						 */
-						 ['Array', '§()', '']
-			    		,['alert', '§({@})', 'alert(String message)']
-			    		,['document']
-			    		,['window']
-			    	]
-		    	,'window' : [
-			    		 ['location']
-			    		,['document']
-			    		,['scrollTo', 'scrollTo({@})', 'scrollTo(Int x,Int y)']
-					]
-		    	,'location' : [
-			    		 ['href']
-					]
-			}
-		}
-	}
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/pas.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/pas.js
deleted file mode 100644
index 26fb74832..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/pas.js
+++ /dev/null
@@ -1,83 +0,0 @@
-editAreaLoader.load_syntax["pas"] = {
-	'DISPLAY_NAME' : 'Pascal'
-	,'COMMENT_SINGLE' : {}
-	,'COMMENT_MULTI' : {'{' : '}', '(*':'*)'}
-	,'QUOTEMARKS' : {1: '"', 2: "'"}
-	,'KEYWORD_CASE_SENSITIVE' : false
-	,'KEYWORDS' : {
-		'constants' : [
-			'Blink', 'Black', 'Blue', 'Green', 'Cyan', 'Red',
-			'Magenta', 'Brown', 'LightGray', 'DarkGray',
-			'LightBlue', 'LightGreen', 'LightCyan', 'LightRed',
-			'LightMagenta', 'Yellow', 'White', 'MaxSIntValue',
-			'MaxUIntValue', 'maxint', 'maxLongint', 'maxSmallint',
-			'erroraddr', 'errorcode', 'LineEnding'
-		]
-		,'keywords' : [
-			'in', 'or', 'div', 'mod', 'and', 'shl', 'shr', 'xor',
-			'pow', 'is', 'not','Absolute', 'And_then', 'Array',
-			'Begin', 'Bindable', 'Case', 'Const', 'Do', 'Downto',
-			'Else', 'End', 'Export', 'File', 'For', 'Function',
-			'Goto', 'If', 'Import', 'Implementation', 'Inherited',
-			'Inline', 'Interface', 'Label', 'Module', 'Nil',
-			'Object', 'Of', 'Only', 'Operator', 'Or_else',
-			'Otherwise', 'Packed', 'Procedure', 'Program',
-			'Protected', 'Qualified', 'Record', 'Repeat',
-			'Restricted', 'Set', 'Then', 'To', 'Type', 'Unit',
-			'Until', 'Uses', 'Value', 'Var', 'Virtual', 'While',
-			'With'
-		]
-		,'functions' : [
-			'Abs', 'Addr', 'Append', 'Arctan', 'Assert', 'Assign',
-			'Assigned', 'BinStr', 'Blockread', 'Blockwrite',
-			'Break', 'Chdir', 'Chr', 'Close', 'CompareByte',
-			'CompareChar', 'CompareDWord', 'CompareWord', 'Concat',
-			'Continue', 'Copy', 'Cos', 'CSeg', 'Dec', 'Delete',
-			'Dispose', 'DSeg', 'Eof', 'Eoln', 'Erase', 'Exclude',
-			'Exit', 'Exp', 'Filepos', 'Filesize', 'FillByte',
-			'Fillchar', 'FillDWord', 'Fillword', 'Flush', 'Frac',
-			'Freemem', 'Getdir', 'Getmem', 'GetMemoryManager',
-			'Halt', 'HexStr', 'Hi', 'High', 'Inc', 'Include',
-			'IndexByte', 'IndexChar', 'IndexDWord', 'IndexWord',
-			'Insert', 'IsMemoryManagerSet', 'Int', 'IOresult',
-			'Length', 'Ln', 'Lo', 'LongJmp', 'Low', 'Lowercase',
-			'Mark', 'Maxavail', 'Memavail', 'Mkdir', 'Move',
-			'MoveChar0', 'New', 'Odd', 'OctStr', 'Ofs', 'Ord',
-			'Paramcount', 'Paramstr', 'Pi', 'Pos', 'Power', 'Pred',
-			'Ptr', 'Random', 'Randomize', 'Read', 'Readln',
-			'Real2Double', 'Release', 'Rename', 'Reset', 'Rewrite',
-			'Rmdir', 'Round', 'Runerror', 'Seek', 'SeekEof',
-			'SeekEoln', 'Seg', 'SetMemoryManager', 'SetJmp',
-			'SetLength', 'SetString', 'SetTextBuf', 'Sin', 'SizeOf',
-			'Sptr', 'Sqr', 'Sqrt', 'SSeg', 'Str', 'StringOfChar',
-			'Succ', 'Swap', 'Trunc', 'Truncate', 'Upcase', 'Val',
-			'Write', 'WriteLn'
-		]
-		,'types' : [
-			'Integer', 'Shortint', 'SmallInt', 'Longint',
-			'Longword', 'Int64', 'Byte', 'Word', 'Cardinal',
-			'QWord', 'Boolean', 'ByteBool', 'LongBool', 'Char',
-			'Real', 'Single', 'Double', 'Extended', 'Comp',
-			'String', 'ShortString', 'AnsiString', 'PChar'
-		]
-	}
-	,'OPERATORS' :[
-		'@', '*', '+', '-', '/', '^', ':=', '<', '=', '>'
-	]
-	,'DELIMITERS' :[
-		'(', ')', '[', ']'
-	]
-	,'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;'
-		,'QUOTESMARKS': 'color: #6381F8;'
-		,'KEYWORDS' : {
-			'specials' : 'color: #EE0000;'
-			,'constants' : 'color: #654321;'
-			,'keywords' : 'color: #48BDDF;'
-			,'functions' : 'color: #449922;'
-			,'types' : 'color: #2B60FF;'
-			}
-		,'OPERATORS' : 'color: #FF00FF;'
-		,'DELIMITERS' : 'color: #60CA00;'
-	}
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/perl.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/perl.js
deleted file mode 100644
index 0313c0c68..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/perl.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/***************************************************************************
- * (c) 2008 - file created by Christoph Pinkel, MTC Infomedia OHG.
- *
- * You may choose any license of the current release or any future release
- * of editarea to use, modify and/or redistribute this file.
- *
- * This language specification file supports for syntax checking on
- * a large subset of Perl 5.x.
- * The basic common syntax of Perl is fully supported, but as for
- * the highlighting of built-in operations, it's mainly designed
- * to support for hightlighting Perl code in a Safe environment (compartment)
- * as used by CoMaNet for evaluation of administrative scripts. This Safe
- * compartment basically allows for all of Opcode's :default operations,
- * but little others. See http://perldoc.perl.org/Opcode.html to learn
- * more.
- ***************************************************************************/
-
-editAreaLoader.load_syntax["perl"] = {
-	'DISPLAY_NAME' : 'Perl',
-	'COMMENT_SINGLE' : {1 : '#'},
-	'QUOTEMARKS' : {1: "'", 2: '"'},
-	'KEYWORD_CASE_SENSITIVE' : true,
-	'KEYWORDS' :
-	{
-		'core' :
-			[ "if", "else", "elsif", "while", "for", "each", "foreach",
-				"next", "last", "goto", "exists", "delete", "undef",
-				"my", "our", "local", "use", "require", "package", "keys", "values",
-				"sub", "bless", "ref", "return" ],
-		'functions' :
-			[
-				//from :base_core
-				"int", "hex", "oct", "abs", "substr", "vec", "study", "pos",
-				"length", "index", "rindex", "ord", "chr", "ucfirst", "lcfirst",
-				"uc", "lc", "quotemeta", "chop", "chomp", "split", "list", "splice",
-				"push", "pop", "shift", "unshift", "reverse", "and", "or", "dor",
-				"xor", "warn", "die", "prototype",
-				//from :base_mem
-				"concat", "repeat", "join", "range",
-				//none from :base_loop, as we'll see them as basic statements...
-				//from :base_orig
-				"sprintf", "crypt", "tie", "untie", "select", "localtime", "gmtime",
-				//others
-				"print", "open", "close"
-			]
-	},
-	'OPERATORS' :
-		[ '+', '-', '/', '*', '=', '<', '>', '!', '||', '.', '&&',
-			' eq ', ' ne ', '=~' ],
-	'DELIMITERS' :
-		[ '(', ')', '[', ']', '{', '}' ],
-	'REGEXPS' :
-	{
-		'packagedecl' : { 'search': '(package )([^ \r\n\t#;]*)()',
-			'class' : 'scopingnames',
-			'modifiers' : 'g', 'execute' : 'before' },
-		'subdecl' : { 'search': '(sub )([^ \r\n\t#]*)()',
-			'class' : 'scopingnames',
-			'modifiers' : 'g', 'execute' : 'before' },
-		'scalars' : { 'search': '()(\\\$[a-zA-Z0-9_:]*)()',
-			'class' : 'vars',
-			'modifiers' : 'g', 'execute' : 'after' },
-		'arrays' : { 'search': '()(@[a-zA-Z0-9_:]*)()',
-			'class' : 'vars',
-			'modifiers' : 'g', 'execute' : 'after' },
-		'hashs' : { 'search': '()(%[a-zA-Z0-9_:]*)()',
-			'class' : 'vars',
-			'modifiers' : 'g', 'execute' : 'after' },
-	},
-
-	'STYLES' :
-	{
-		'COMMENTS': 'color: #AAAAAA;',
-		'QUOTESMARKS': 'color: #DC0000;',
-		'KEYWORDS' :
-		{
-			'core' : 'color: #8aca00;',
-			'functions' : 'color: #2B60FF;'
-		},
-		'OPERATORS' : 'color: #8aca00;',
-		'DELIMITERS' : 'color: #0038E1;',
-		'REGEXPS':
-		{
-			'scopingnames' : 'color: #ff0000;',
-			'vars' : 'color: #00aaaa;',
-		}
-	} //'STYLES'
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/php.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/php.js
deleted file mode 100644
index f53dc8895..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/php.js
+++ /dev/null
@@ -1,157 +0,0 @@
-editAreaLoader.load_syntax["php"] = {
-	'DISPLAY_NAME' : 'Php'
-	,'COMMENT_SINGLE' : {1 : '//', 2 : '#'}
-	,'COMMENT_MULTI' : {'/*' : '*/'}
-	,'QUOTEMARKS' : {1: "'", 2: '"'}
-	,'KEYWORD_CASE_SENSITIVE' : false
-	,'KEYWORDS' : {
-		'statements' : [
-			'include', 'require', 'include_once', 'require_once',
-			'for', 'foreach', 'as', 'if', 'elseif', 'else', 'while', 'do', 'endwhile',
-            'endif', 'switch', 'case', 'endswitch',
-			'return', 'break', 'continue'
-		]
-		,'reserved' : [
-			'_GET', '_POST', '_SESSION', '_SERVER', '_FILES', '_ENV', '_COOKIE', '_REQUEST',
-			'null', '__LINE__', '__FILE__',
-			'false', '&lt;?php', '?&gt;', '&lt;?',
-			'&lt;script language', '&lt;/script&gt;',
-			'true', 'var', 'default',
-			'function', 'class', 'new', '&amp;new', 'this',
-			'__FUNCTION__', '__CLASS__', '__METHOD__', 'PHP_VERSION',
-			'PHP_OS', 'DEFAULT_INCLUDE_PATH', 'PEAR_INSTALL_DIR', 'PEAR_EXTENSION_DIR',
-			'PHP_EXTENSION_DIR', 'PHP_BINDIR', 'PHP_LIBDIR', 'PHP_DATADIR', 'PHP_SYSCONFDIR',
-			'PHP_LOCALSTATEDIR', 'PHP_CONFIG_FILE_PATH', 'PHP_OUTPUT_HANDLER_START', 'PHP_OUTPUT_HANDLER_CONT',
-			'PHP_OUTPUT_HANDLER_END', 'E_ERROR', 'E_WARNING', 'E_PARSE', 'E_NOTICE',
-			'E_CORE_ERROR', 'E_CORE_WARNING', 'E_COMPILE_ERROR', 'E_COMPILE_WARNING', 'E_USER_ERROR',
-			'E_USER_WARNING', 'E_USER_NOTICE', 'E_ALL'
-			
-		]
-		,'functions' : [
-			'func_num_args', 'func_get_arg', 'func_get_args', 'strlen', 'strcmp', 'strncmp', 'strcasecmp', 'strncasecmp', 'each', 'error_reporting', 'define', 'defined',
-			'trigger_error', 'user_error', 'set_error_handler', 'restore_error_handler', 'get_declared_classes', 'get_loaded_extensions',
-			'extension_loaded', 'get_extension_funcs', 'debug_backtrace',
-			'constant', 'bin2hex', 'sleep', 'usleep', 'time', 'mktime', 'gmmktime', 'strftime', 'gmstrftime', 'strtotime', 'date', 'gmdate', 'getdate', 'localtime', 'checkdate', 'flush', 'wordwrap', 'htmlspecialchars', 'htmlentities', 'html_entity_decode', 'md5', 'md5_file', 'crc32', 'getimagesize', 'image_type_to_mime_type', 'phpinfo', 'phpversion', 'phpcredits', 'strnatcmp', 'strnatcasecmp', 'substr_count', 'strspn', 'strcspn', 'strtok', 'strtoupper', 'strtolower', 'strpos', 'strrpos', 'strrev', 'hebrev', 'hebrevc', 'nl2br', 'basename', 'dirname', 'pathinfo', 'stripslashes', 'stripcslashes', 'strstr', 'stristr', 'strrchr', 'str_shuffle', 'str_word_count', 'strcoll', 'substr', 'substr_replace', 'quotemeta', 'ucfirst', 'ucwords', 'strtr', 'addslashes', 'addcslashes', 'rtrim', 'str_replace', 'str_repeat', 'count_chars', 'chunk_split', 'trim', 'ltrim', 'strip_tags', 'similar_text', 'explode', 'implode', 'setlocale', 'localeconv',
-			'parse_str', 'str_pad', 'chop', 'strchr', 'sprintf', 'printf', 'vprintf', 'vsprintf', 'sscanf', 'fscanf', 'parse_url', 'urlencode', 'urldecode', 'rawurlencode', 'rawurldecode', 'readlink', 'linkinfo', 'link', 'unlink', 'exec', 'system', 'escapeshellcmd', 'escapeshellarg', 'passthru', 'shell_exec', 'proc_open', 'proc_close', 'rand', 'srand', 'getrandmax', 'mt_rand', 'mt_srand', 'mt_getrandmax', 'base64_decode', 'base64_encode', 'abs', 'ceil', 'floor', 'round', 'is_finite', 'is_nan', 'is_infinite', 'bindec', 'hexdec', 'octdec', 'decbin', 'decoct', 'dechex', 'base_convert', 'number_format', 'fmod', 'ip2long', 'long2ip', 'getenv', 'putenv', 'getopt', 'microtime', 'gettimeofday', 'getrusage', 'uniqid', 'quoted_printable_decode', 'set_time_limit', 'get_cfg_var', 'magic_quotes_runtime', 'set_magic_quotes_runtime', 'get_magic_quotes_gpc', 'get_magic_quotes_runtime',
-			'import_request_variables', 'error_log', 'serialize', 'unserialize', 'memory_get_usage', 'var_dump', 'var_export', 'debug_zval_dump', 'print_r','highlight_file', 'show_source', 'highlight_string', 'ini_get', 'ini_get_all', 'ini_set', 'ini_alter', 'ini_restore', 'get_include_path', 'set_include_path', 'restore_include_path', 'setcookie', 'header', 'headers_sent', 'connection_aborted', 'connection_status', 'ignore_user_abort', 'parse_ini_file', 'is_uploaded_file', 'move_uploaded_file', 'intval', 'floatval', 'doubleval', 'strval', 'gettype', 'settype', 'is_null', 'is_resource', 'is_bool', 'is_long', 'is_float', 'is_int', 'is_integer', 'is_double', 'is_real', 'is_numeric', 'is_string', 'is_array', 'is_object', 'is_scalar',
-			'ereg', 'ereg_replace', 'eregi', 'eregi_replace', 'split', 'spliti', 'join', 'sql_regcase', 'dl', 'pclose', 'popen', 'readfile', 'rewind', 'rmdir', 'umask', 'fclose', 'feof', 'fgetc', 'fgets', 'fgetss', 'fread', 'fopen', 'fpassthru', 'ftruncate', 'fstat', 'fseek', 'ftell', 'fflush', 'fwrite', 'fputs', 'mkdir', 'rename', 'copy', 'tempnam', 'tmpfile', 'file', 'file_get_contents', 'stream_select', 'stream_context_create', 'stream_context_set_params', 'stream_context_set_option', 'stream_context_get_options', 'stream_filter_prepend', 'stream_filter_append', 'fgetcsv', 'flock', 'get_meta_tags', 'stream_set_write_buffer', 'set_file_buffer', 'set_socket_blocking', 'stream_set_blocking', 'socket_set_blocking', 'stream_get_meta_data', 'stream_register_wrapper', 'stream_wrapper_register', 'stream_set_timeout', 'socket_set_timeout', 'socket_get_status', 'realpath', 'fnmatch', 'fsockopen', 'pfsockopen', 'pack', 'unpack', 'get_browser', 'crypt', 'opendir', 'closedir', 'chdir', 'getcwd', 'rewinddir', 'readdir', 'dir', 'glob', 'fileatime', 'filectime', 'filegroup', 'fileinode', 'filemtime', 'fileowner', 'fileperms', 'filesize', 'filetype', 'file_exists', 'is_writable', 'is_writeable', 'is_readable', 'is_executable', 'is_file', 'is_dir', 'is_link', 'stat', 'lstat', 'chown',
-			'touch', 'clearstatcache', 'mail', 'ob_start', 'ob_flush', 'ob_clean', 'ob_end_flush', 'ob_end_clean', 'ob_get_flush', 'ob_get_clean', 'ob_get_length', 'ob_get_level', 'ob_get_status', 'ob_get_contents', 'ob_implicit_flush', 'ob_list_handlers', 'ksort', 'krsort', 'natsort', 'natcasesort', 'asort', 'arsort', 'sort', 'rsort', 'usort', 'uasort', 'uksort', 'shuffle', 'array_walk', 'count', 'end', 'prev', 'next', 'reset', 'current', 'key', 'min', 'max', 'in_array', 'array_search', 'extract', 'compact', 'array_fill', 'range', 'array_multisort', 'array_push', 'array_pop', 'array_shift', 'array_unshift', 'array_splice', 'array_slice', 'array_merge', 'array_merge_recursive', 'array_keys', 'array_values', 'array_count_values', 'array_reverse', 'array_reduce', 'array_pad', 'array_flip', 'array_change_key_case', 'array_rand', 'array_unique', 'array_intersect', 'array_intersect_assoc', 'array_diff', 'array_diff_assoc', 'array_sum', 'array_filter', 'array_map', 'array_chunk', 'array_key_exists', 'pos', 'sizeof', 'key_exists', 'assert', 'assert_options', 'version_compare', 'ftok', 'str_rot13', 'aggregate',
-			'session_name', 'session_module_name', 'session_save_path', 'session_id', 'session_regenerate_id', 'session_decode', 'session_register', 'session_unregister', 'session_is_registered', 'session_encode',
-			'session_start', 'session_destroy', 'session_unset', 'session_set_save_handler', 'session_cache_limiter', 'session_cache_expire', 'session_set_cookie_params', 'session_get_cookie_params', 'session_write_close', 'preg_match', 'preg_match_all', 'preg_replace', 'preg_replace_callback', 'preg_split', 'preg_quote', 'preg_grep', 'overload', 'ctype_alnum', 'ctype_alpha', 'ctype_cntrl', 'ctype_digit', 'ctype_lower', 'ctype_graph', 'ctype_print', 'ctype_punct', 'ctype_space', 'ctype_upper', 'ctype_xdigit', 'virtual', 'apache_request_headers', 'apache_note', 'apache_lookup_uri', 'apache_child_terminate', 'apache_setenv', 'apache_response_headers', 'apache_get_version', 'getallheaders', 'mysql_connect', 'mysql_pconnect', 'mysql_close', 'mysql_select_db', 'mysql_create_db', 'mysql_drop_db', 'mysql_query', 'mysql_unbuffered_query', 'mysql_db_query', 'mysql_list_dbs', 'mysql_list_tables', 'mysql_list_fields', 'mysql_list_processes', 'mysql_error', 'mysql_errno', 'mysql_affected_rows', 'mysql_insert_id', 'mysql_result', 'mysql_num_rows', 'mysql_num_fields', 'mysql_fetch_row', 'mysql_fetch_array', 'mysql_fetch_assoc', 'mysql_fetch_object', 'mysql_data_seek', 'mysql_fetch_lengths', 'mysql_fetch_field', 'mysql_field_seek', 'mysql_free_result', 'mysql_field_name', 'mysql_field_table', 'mysql_field_len', 'mysql_field_type', 'mysql_field_flags', 'mysql_escape_string', 'mysql_real_escape_string', 'mysql_stat',
-			'mysql_thread_id', 'mysql_client_encoding', 'mysql_get_client_info', 'mysql_get_host_info', 'mysql_get_proto_info', 'mysql_get_server_info', 'mysql_info', 'mysql', 'mysql_fieldname', 'mysql_fieldtable', 'mysql_fieldlen', 'mysql_fieldtype', 'mysql_fieldflags', 'mysql_selectdb', 'mysql_createdb', 'mysql_dropdb', 'mysql_freeresult', 'mysql_numfields', 'mysql_numrows', 'mysql_listdbs', 'mysql_listtables', 'mysql_listfields', 'mysql_db_name', 'mysql_dbname', 'mysql_tablename', 'mysql_table_name', 'pg_connect', 'pg_pconnect', 'pg_close', 'pg_connection_status', 'pg_connection_busy', 'pg_connection_reset', 'pg_host', 'pg_dbname', 'pg_port', 'pg_tty', 'pg_options', 'pg_ping', 'pg_query', 'pg_send_query', 'pg_cancel_query', 'pg_fetch_result', 'pg_fetch_row', 'pg_fetch_assoc', 'pg_fetch_array', 'pg_fetch_object', 'pg_fetch_all', 'pg_affected_rows', 'pg_get_result', 'pg_result_seek', 'pg_result_status', 'pg_free_result', 'pg_last_oid', 'pg_num_rows', 'pg_num_fields', 'pg_field_name', 'pg_field_num', 'pg_field_size', 'pg_field_type', 'pg_field_prtlen', 'pg_field_is_null', 'pg_get_notify', 'pg_get_pid', 'pg_result_error', 'pg_last_error', 'pg_last_notice', 'pg_put_line', 'pg_end_copy', 'pg_copy_to', 'pg_copy_from',
-			'pg_trace', 'pg_untrace', 'pg_lo_create', 'pg_lo_unlink', 'pg_lo_open', 'pg_lo_close', 'pg_lo_read', 'pg_lo_write', 'pg_lo_read_all', 'pg_lo_import', 'pg_lo_export', 'pg_lo_seek', 'pg_lo_tell', 'pg_escape_string', 'pg_escape_bytea', 'pg_unescape_bytea', 'pg_client_encoding', 'pg_set_client_encoding', 'pg_meta_data', 'pg_convert', 'pg_insert', 'pg_update', 'pg_delete', 'pg_select', 'pg_exec', 'pg_getlastoid', 'pg_cmdtuples', 'pg_errormessage', 'pg_numrows', 'pg_numfields', 'pg_fieldname', 'pg_fieldsize', 'pg_fieldtype', 'pg_fieldnum', 'pg_fieldprtlen', 'pg_fieldisnull', 'pg_freeresult', 'pg_result', 'pg_loreadall', 'pg_locreate', 'pg_lounlink', 'pg_loopen', 'pg_loclose', 'pg_loread', 'pg_lowrite', 'pg_loimport', 'pg_loexport',
-			'echo', 'print', 'global', 'static', 'exit', 'array', 'empty', 'eval', 'isset', 'unset', 'die'
-
-		]
-	}
-	,'OPERATORS' :[
-		'+', '-', '/', '*', '=', '<', '>', '%', '!', '&&', '||'
-	]
-	,'DELIMITERS' :[
-		'(', ')', '[', ']', '{', '}'
-	]
-	,'REGEXPS' : {
-		// highlight all variables ($...)
-		'variables' : {
-			'search' : '()(\\$\\w+)()'
-			,'class' : 'variables'
-			,'modifiers' : 'g'
-			,'execute' : 'before' // before or after
-		}
-	}
-	,'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;'
-		,'QUOTESMARKS': 'color: #879EFA;'
-		,'KEYWORDS' : {
-			'reserved' : 'color: #48BDDF;'
-			,'functions' : 'color: #0040FD;'
-			,'statements' : 'color: #60CA00;'
-			}
-		,'OPERATORS' : 'color: #FF00FF;'
-		,'DELIMITERS' : 'color: #2B60FF;'
-		,'REGEXPS' : {
-			'variables' : 'color: #E0BD54;'
-		}		
-	}
-	,'AUTO_COMPLETION' :  {
-		"default": {	// the name of this definition group. It's posisble to have different rules inside the same definition file
-			"REGEXP": { "before_word": "[^a-zA-Z0-9_]|^"	// \\s|\\.|
-						,"possible_words_letters": "[a-zA-Z0-9_\$]+"
-						,"letter_after_word_must_match": "[^a-zA-Z0-9_]|$"
-						,"prefix_separator": "\\-\\>|\\:\\:"
-					}
-			,"CASE_SENSITIVE": true
-			,"MAX_TEXT_LENGTH": 100		// the maximum length of the text being analyzed before the cursor position
-			,"KEYWORDS": {
-					'': [	// the prefix of thoses items
-						/**
-						 * 0 : the keyword the user is typing
-						 * 1 : (optionnal) the string inserted in code ("{@}" being the new position of the cursor, "§" beeing the equivalent to the value the typed string indicated if the previous )
-						 * 		If empty the keyword will be displayed
-						 * 2 : (optionnal) the text that appear in the suggestion box (if empty, the string to insert will be displayed)
-						 */
-						 ['$_POST']
-			    		,['$_GET']
-			    		,['$_SESSION']
-			    		,['$_SERVER']
-			    		,['$_FILES']
-			    		,['$_ENV']
-			    		,['$_COOKIE']
-			    		,['$_REQUEST']
-			    		// magic methods
-			    		,['__construct', '§( {@} )']
-			    		,['__destruct', '§( {@} )']
-			    		,['__sleep', '§( {@} )']
-			    		,['__wakeup', '§( {@} )']
-			    		,['__toString', '§( {@} )']
-			    		// include
-			    		,['include', '§ "{@}";']
-			    		,['include_once', '§ "{@}";']
-			    		,['require', '§ "{@}";']
-			    		,['require_once', '§ "{@}";']
-			    		// statements
-			    		,['for', '§( {@} )']
-			    		,['foreach', '§( {@} )']
-			    		,['if', '§( {@} )']
-			    		,['elseif', '§( {@} )']
-			    		,['while', '§( {@} )']
-			    		,['switch', '§( {@} )']
-			    		,['break']
-			    		,['case']
-			    		,['continue']
-			    		,['do']
-			    		,['else']
-			    		,['endif']
-			    		,['endswitch']
-			    		,['endwhile']
-			    		,['return']
-			    		// function
-			    		,['unset', '§( {@} )']
-					]
-				}
-			}
-		,"live": {	
-			
-			// class NAME: /class\W+([a-z]+)\W+/gi
-			// method: /^(public|private|protected)?\s*function\s+([a-z][a-z0-9\_]*)\s*(\([^\{]*\))/gmi
-			// static: /^(public|private|protected)?\s+static\s+(public|private|protected)?\s*function\s+([a-z][a-z0-9\_]*)\s*(\([^\{]*\))/gmi 
-			// attributes: /(\$this\-\>|(?:var|public|protected|private)\W+\$)([a-z0-9\_]+)(?!\()\b/gi 
-			// 		v1 : /(\$this\-\>|var\W+|public\W+|protected\W+|private\W+)([a-z0-9\_]+)\W*(=|;)/gi 
-			// var type: /(\$(this\-\>)?[a-z0-9\_]+)\s*\=\s*new\s+([a-z0-9\_])+/gi 
-			
-			
-			"REGEXP": { "before_word": "[^a-zA-Z0-9_]|^"	// \\s|\\.|
-						,"possible_words_letters": "[a-zA-Z0-9_\$]+"
-						,"letter_after_word_must_match": "[^a-zA-Z0-9_]|$"
-						,"prefix_separator": "\\-\\>"
-					}
-			,"CASE_SENSITIVE": true
-			,"MAX_TEXT_LENGTH": 100		// the maximum length of the text being analyzed before the cursor position
-			,"KEYWORDS": {
-					'$this': [	// the prefix of thoses items
-						['test']
-					]
-				}
-			}
-	}
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/python.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/python.js
deleted file mode 100644
index e9f4314ed..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/python.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * Python syntax v 1.1 
- * 
- * v1.1 by Andre Roberge (2006/12/27)
- *   
-**/
-editAreaLoader.load_syntax["python"] = {
-	'DISPLAY_NAME' : 'Python'
-	,'COMMENT_SINGLE' : {1 : '#'}
-	,'COMMENT_MULTI' : {}
-	,'QUOTEMARKS' : {1: "'", 2: '"'}
-	,'KEYWORD_CASE_SENSITIVE' : true
-	,'KEYWORDS' : {
-		/*
-		** Set 1: reserved words
-		** http://python.org/doc/current/ref/keywords.html
-		** Note: 'as' and 'with' have been added starting with Python 2.5
-		*/
-		'reserved' : [
-			'and', 'as', 'assert', 'break', 'class', 'continue', 'def', 'del', 'elif',
-			'else', 'except', 'exec', 'finally', 'for', 'from', 'global', 'if', 
-			'import', 'is', 'in', 'lambda', 'not', 'or', 'pass', 'print', 'raise',
-			'return', 'try', 'while', 'with', 'yield'
-			//the following are *almost* reserved; we'll treat them as such
-			, 'False', 'True', 'None'
-		]
-		/*
-		** Set 2: builtins
-		** http://python.org/doc/current/lib/built-in-funcs.html
-		*/	
-		,'builtins' : [
-			'__import__', 'abs', 'basestring', 'bool', 'callable', 'chr', 'classmethod', 'cmp', 
-			'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'execfile', 
-			'file', 'filter', 'float', 'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help',
-			'hex', 'id', 'input', 'int', 'isinstance', 'issubclass', 'iter', 'len', 'list', 'locals',
-			'long', 'map', 'max', 'min', 'object', 'oct', 'open', 'ord', 'pow', 'property', 'range',
-			'raw_input', 'reduce', 'reload', 'repr', 'reversed', 'round', 'set', 'setattr', 'slice',
-			'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr', 'unicode', 
-			'vars', 'xrange', 'zip',
-			// Built-in constants: http://www.python.org/doc/2.4.1/lib/node35.html
-			//'False', 'True', 'None' have been included in 'reserved'
-			'NotImplemented', 'Ellipsis',
-			// Built-in Exceptions: http://python.org/doc/current/lib/module-exceptions.html
-			'Exception', 'StandardError', 'ArithmeticError', 'LookupError', 'EnvironmentError',
-			'AssertionError', 'AttributeError', 'EOFError', 'FloatingPointError', 'IOError',
-			'ImportError', 'IndexError', 'KeyError', 'KeyboardInterrupt', 'MemoryError', 'NameError',
-			'NotImplementedError', 'OSError', 'OverflowError', 'ReferenceError', 'RuntimeError',
-			'StopIteration', 'SyntaxError', 'SystemError', 'SystemExit', 'TypeError',
-			'UnboundlocalError', 'UnicodeError', 'UnicodeEncodeError', 'UnicodeDecodeError',
-			'UnicodeTranslateError', 'ValueError', 'WindowsError', 'ZeroDivisionError', 'Warning',
-			'UserWarning', 'DeprecationWarning', 'PendingDeprecationWarning', 'SyntaxWarning',
-			'RuntimeWarning', 'FutureWarning',		
-			// we will include the string methods as well
-			// http://python.org/doc/current/lib/string-methods.html
-			'capitalize', 'center', 'count', 'decode', 'encode', 'endswith', 'expandtabs',
-			'find', 'index', 'isalnum', 'isaplpha', 'isdigit', 'islower', 'isspace', 'istitle',
-			'isupper', 'join', 'ljust', 'lower', 'lstrip', 'replace', 'rfind', 'rindex', 'rjust',
-			'rsplit', 'rstrip', 'split', 'splitlines', 'startswith', 'strip', 'swapcase', 'title',
-			'translate', 'upper', 'zfill'
-		]
-		/*
-		** Set 3: standard library
-		** http://python.org/doc/current/lib/modindex.html
-		*/
-		,'stdlib' : [
-			'__builtin__', '__future__', '__main__', '_winreg', 'aifc', 'AL', 'al', 'anydbm',
-			'array', 'asynchat', 'asyncore', 'atexit', 'audioop', 'base64', 'BaseHTTPServer',
-			'Bastion', 'binascii', 'binhex', 'bisect', 'bsddb', 'bz2', 'calendar', 'cd', 'cgi',
-			'CGIHTTPServer', 'cgitb', 'chunk', 'cmath', 'cmd', 'code', 'codecs', 'codeop',
-			'collections', 'colorsys', 'commands', 'compileall', 'compiler', 'compiler',
-			'ConfigParser', 'Cookie', 'cookielib', 'copy', 'copy_reg', 'cPickle', 'crypt',
-			'cStringIO', 'csv', 'curses', 'datetime', 'dbhash', 'dbm', 'decimal', 'DEVICE',
-			'difflib', 'dircache', 'dis', 'distutils', 'dl', 'doctest', 'DocXMLRPCServer', 'dumbdbm',
-			'dummy_thread', 'dummy_threading', 'email', 'encodings', 'errno', 'exceptions', 'fcntl',
-			'filecmp', 'fileinput', 'FL', 'fl', 'flp', 'fm', 'fnmatch', 'formatter', 'fpectl',
-			'fpformat', 'ftplib', 'gc', 'gdbm', 'getopt', 'getpass', 'gettext', 'GL', 'gl', 'glob',
-			'gopherlib', 'grp', 'gzip', 'heapq', 'hmac', 'hotshot', 'htmlentitydefs', 'htmllib',
-			'HTMLParser', 'httplib', 'imageop', 'imaplib', 'imgfile', 'imghdr', 'imp', 'inspect',
-			'itertools', 'jpeg', 'keyword', 'linecache', 'locale', 'logging', 'mailbox', 'mailcap',
-			'marshal', 'math', 'md5', 'mhlib', 'mimetools', 'mimetypes', 'MimeWriter', 'mimify',
-			'mmap', 'msvcrt', 'multifile', 'mutex', 'netrc', 'new', 'nis', 'nntplib', 'operator',
-			'optparse', 'os', 'ossaudiodev', 'parser', 'pdb', 'pickle', 'pickletools', 'pipes',
-			'pkgutil', 'platform', 'popen2', 'poplib', 'posix', 'posixfile', 'pprint', 'profile',
-			'pstats', 'pty', 'pwd', 'py_compile', 'pyclbr', 'pydoc', 'Queue', 'quopri', 'random',
-			're', 'readline', 'repr', 'resource', 'rexec', 'rfc822', 'rgbimg', 'rlcompleter',
-			'robotparser', 'sched', 'ScrolledText', 'select', 'sets', 'sgmllib', 'sha', 'shelve',
-			'shlex', 'shutil', 'signal', 'SimpleHTTPServer', 'SimpleXMLRPCServer', 'site', 'smtpd',
-			'smtplib', 'sndhdr', 'socket', 'SocketServer', 'stat', 'statcache', 'statvfs', 'string',
-			'StringIO', 'stringprep', 'struct', 'subprocess', 'sunau', 'SUNAUDIODEV', 'sunaudiodev',
-			'symbol', 'sys', 'syslog', 'tabnanny', 'tarfile', 'telnetlib', 'tempfile', 'termios',
-			'test', 'textwrap', 'thread', 'threading', 'time', 'timeit', 'Tix', 'Tkinter', 'token',
-			'tokenize', 'traceback', 'tty', 'turtle', 'types', 'unicodedata', 'unittest', 'urllib2',
-			'urllib', 'urlparse', 'user', 'UserDict', 'UserList', 'UserString', 'uu', 'warnings',
-			'wave', 'weakref', 'webbrowser', 'whichdb', 'whrandom', 'winsound', 'xdrlib', 'xml',
-			'xmllib', 'xmlrpclib', 'zipfile', 'zipimport', 'zlib'
-
-		]
-		/*
-		** Set 4: special methods
-		** http://python.org/doc/current/ref/specialnames.html
-		*/
-		,'special' : [
-			// Basic customization: http://python.org/doc/current/ref/customization.html
-			'__new__', '__init__', '__del__', '__repr__', '__str__', 
-			'__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__', '__cmp__', '__rcmp__',
-			'__hash__', '__nonzero__', '__unicode__', '__dict__',
-			// Attribute access: http://python.org/doc/current/ref/attribute-access.html
-			'__setattr__', '__delattr__', '__getattr__', '__getattribute__', '__get__', '__set__',
-			'__delete__', '__slots__',
-			// Class creation, callable objects
-			'__metaclass__', '__call__', 
-			// Container types: http://python.org/doc/current/ref/sequence-types.html
-			'__len__', '__getitem__', '__setitem__', '__delitem__', '__iter__', '__contains__',
-			'__getslice__', '__setslice__', '__delslice__',
-			// Numeric types: http://python.org/doc/current/ref/numeric-types.html
-			'__abs__','__add__','__and__','__coerce__','__div__','__divmod__','__float__',
-			'__hex__','__iadd__','__isub__','__imod__','__idiv__','__ipow__','__iand__',
-			'__ior__','__ixor__', '__ilshift__','__irshift__','__invert__','__int__',
-			'__long__','__lshift__',
-			'__mod__','__mul__','__neg__','__oct__','__or__','__pos__','__pow__',
-			'__radd__','__rdiv__','__rdivmod__','__rmod__','__rpow__','__rlshift__','__rrshift__',
-			'__rshift__','__rsub__','__rmul__','__repr__','__rand__','__rxor__','__ror__',
-			'__sub__','__xor__'
-		]
-	}
-	,'OPERATORS' :[
-		'+', '-', '/', '*', '=', '<', '>', '%', '!', '&', ';', '?', '`', ':', ','
-	]
-	,'DELIMITERS' :[
-		'(', ')', '[', ']', '{', '}'
-	]
-	,'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;'
-		,'QUOTESMARKS': 'color: #660066;'
-		,'KEYWORDS' : {
-			'reserved' : 'color: #0000FF;'
-			,'builtins' : 'color: #009900;'
-			,'stdlib' : 'color: #009900;'
-			,'special': 'color: #006666;'
-			}
-		,'OPERATORS' : 'color: #993300;'
-		,'DELIMITERS' : 'color: #993300;'
-				
-	}
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/robotstxt.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/robotstxt.js
deleted file mode 100644
index 5bca8fe6e..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/robotstxt.js
+++ /dev/null
@@ -1,25 +0,0 @@
-editAreaLoader.load_syntax["robotstxt"] = {
-	'DISPLAY_NAME' : 'Robots txt',
-	'COMMENT_SINGLE' : {1 : '#'},
-	'COMMENT_MULTI' : {},
-	'QUOTEMARKS' : [],
-	'KEYWORD_CASE_SENSITIVE' : false,
-	'KEYWORDS' : {
-		'attributes' : ['User-agent', 'Disallow', 'Allow', 'Crawl-delay'],
-		'values' : ['*'],
-		'specials' : ['*']
-	},
-	'OPERATORS' :[':'],
-	'DELIMITERS' :[],
-	'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;',
-		'QUOTESMARKS': 'color: #6381F8;',
-		'KEYWORDS' : {
-			'attributes' : 'color: #48BDDF;',
-			'values' : 'color: #2B60FF;',
-			'specials' : 'color: #FF0000;'
-			},
-	'OPERATORS' : 'color: #FF00FF;',
-	'DELIMITERS' : 'color: #60CA00;'			
-	}
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/ruby.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/ruby.js
deleted file mode 100644
index 2049cf50e..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/ruby.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Ruby syntax v 1.0 
- * 
- * v1.0 by Patrice De Saint Steban (2007/01/03)
- *   
-**/
-editAreaLoader.load_syntax["ruby"] = {
-	'DISPLAY_NAME' : 'Ruby'
-	,'COMMENT_SINGLE' : {1 : '#'}
-	,'COMMENT_MULTI' : {}
-	,'QUOTEMARKS' : {1: "'", 2: '"'}
-	,'KEYWORD_CASE_SENSITIVE' : true
-	,'KEYWORDS' : {
-		'reserved' : [
-			'alias', 'and', 'BEGIN', 'begin', 'break', 'case', 'class', 'def', 'defined', 'do', 'else',
-			'elsif', 'END', 'end', 'ensure', 'false', 'for', 'if', 
-			'in', 'module', 'next', 'not', 'or', 'redo', 'rescue', 'retry',
-			'return', 'self', 'super', 'then', 'true', 'undef', 'unless', 'until', 'when', 'while', 'yield'
-		]
-	}
-	,'OPERATORS' :[
-		'+', '-', '/', '*', '=', '<', '>', '%', '!', '&', ';', '?', '`', ':', ','
-	]
-	,'DELIMITERS' :[
-		'(', ')', '[', ']', '{', '}'
-	]
-	,'REGEXPS' : {
-		'constants' : {
-			'search' : '()([A-Z]\\w*)()'
-			,'class' : 'constants'
-			,'modifiers' : 'g'
-			,'execute' : 'before' 
-		}
-		,'variables' : {
-			'search' : '()([\$\@\%]+\\w+)()'
-			,'class' : 'variables'
-			,'modifiers' : 'g'
-			,'execute' : 'before' 
-		}
-		,'numbers' : {
-			'search' : '()(-?[0-9]+)()'
-			,'class' : 'numbers'
-			,'modifiers' : 'g'
-			,'execute' : 'before' 
-		}
-		,'symbols' : {
-			'search' : '()(:\\w+)()'
-			,'class' : 'symbols'
-			,'modifiers' : 'g'
-			,'execute' : 'before'
-		}
-	}
-	,'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;'
-		,'QUOTESMARKS': 'color: #660066;'
-		,'KEYWORDS' : {
-			'reserved' : 'font-weight: bold; color: #0000FF;'
-			}
-		,'OPERATORS' : 'color: #993300;'
-		,'DELIMITERS' : 'color: #993300;'
-		,'REGEXPS' : {
-			'variables' : 'color: #E0BD54;'
-			,'numbers' : 'color: green;'
-			,'constants' : 'color: #00AA00;'
-			,'symbols' : 'color: #879EFA;'
-		}	
-	}
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/sql.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/sql.js
deleted file mode 100644
index 2f6dbda7b..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/sql.js
+++ /dev/null
@@ -1,56 +0,0 @@
-editAreaLoader.load_syntax["sql"] = {
-	'DISPLAY_NAME' : 'SQL'
-	,'COMMENT_SINGLE' : {1 : '--'}
-	,'COMMENT_MULTI' : {'/*' : '*/'}
-	,'QUOTEMARKS' : {1: "'", 2: '"', 3: '`'}
-	,'KEYWORD_CASE_SENSITIVE' : false
-	,'KEYWORDS' : {
-		'statements' : [
-			'select', 'SELECT', 'where', 'order', 'by',
-			'insert', 'from', 'update', 'grant', 'left join', 'right join', 
-            'union', 'group', 'having', 'limit', 'alter', 'LIKE','IN','CASE'
-		]
-		,'reserved' : [
-			'null', 'enum', 'int', 'boolean', 'add', 'varchar'
-			
-		]
-		,'functions' : [
-   'ABS','ACOS','ADDDATE','ADDTIME','AES_DECRYPT','AES_ENCRYPT','ASCII','ASIN','ATAN2 ATAN','ATAN','AVG','BENCHMARK','DISTINCT','BIN','BIT_AND','BIT_COUNT','BIT_LENGTH','BIT_OR','BIT_XOR','CAST','CEILING CEIL','CHAR_LENGTH','CHAR',
-'CHARACTER_LENGTH','CHARSET','COALESCE','COERCIBILITY','COLLATION','COMPRESS','CONCAT_WS','CONCAT','CONNECTION_ID','CONV','CONVERT_TZ','COS','COT','COUNT','CRC32','CURDATE','CURRENT_DATE','CURRENT_TIME','CURRENT_TIMESTAMP','CURRENT_USER','CURTIME','DATABASE','DATE_ADD','DATE_FORMAT','DATE_SUB','DATE','DATEDIFF','DAY','DAYNAME','DAYOFMONTH',
-'DAYOFWEEK','DAYOFYEAR','DECODE','DEFAULT','DEGREES','DES_DECRYPT','DES_ENCRYPT','ELT','ENCODE','ENCRYPT','EXP','EXPORT_SET','EXTRACT','FIELD','FIND_IN_SET','FLOOR','FORMAT','FOUND_ROWS','FROM_DAYS','FROM_UNIXTIME','GET_FORMAT','GET_LOCK','GREATEST','GROUP_CONCAT','HEX','HOUR','IF','IFNULL','INET_ATON','INET_NTOA',
-'INSERT','INSTR','INTERVAL','IS_FREE_LOCK','IS_USED_LOCK','ISNULL','LAST_DAY','LAST_INSERT_ID','LCASE','LEAST','LEFT','LENGTH','LN','LOAD_FILE','LOCALTIME','LOCALTIMESTAMP','LOCATE','LOG10','LOG2','LOG','LOWER','LPAD','LTRIM','MAKE_SET','MAKEDATE','MAKETIME','MASTER_POS_WAIT','MAX','MD5','MICROSECOND',
-'MID','MIN','MINUTE','MOD','MONTH','MONTHNAME','NOW','NULLIF','OCT','OCTET_LENGTH','OLD_PASSWORD','ORD','PASSWORD','PERIOD_ADD','PERIOD_DIFF','PI','POSITION','POW','POWER','PROCEDURE ANALYSE','QUARTER','QUOTE','RADIANS','RAND','RELEASE_LOCK','REPEAT','REPLACE','REVERSE','RIGHT','ROUND',
-'RPAD','RTRIM','SEC_TO_TIME','SECOND','SESSION_USER','SHA1','SHA','SIGN','SIN','SOUNDEX','SOUNDS LIKE','SPACE','SQRT','STD','STDDEV','STR_TO_DATE','STRCMP','SUBDATE','SUBSTRING_INDEX','SUBSTRING','SUBSTR','SUBTIME','SUM','SYSDATE','SYSTEM_USER','TAN','TIME_FORMAT','TIME_TO_SEC','TIME','TIMEDIFF',
-'TIMESTAMP','TO_DAYS','TRIM','TRUNCATE','UCASE','UNCOMPRESS','UNCOMPRESSED_LENGTH','UNHEX','UNIX_TIMESTAMP','UPPER','USER','UTC_DATE','UTC_TIME','UTC_TIMESTAMP','UUID','VALUES','VARIANCE','WEEK','WEEKDAY','WEEKOFYEAR','YEAR','YEARWEEK'
-		]
-	}
-	,'OPERATORS' :[
-     'AND','&&','BETWEEN','BINARY','&','|','^','/','DIV','<=>','=','>=','>','<<','>>','IS','NULL','<=','<','-','%','!=','<>','!','||','OR','+','REGEXP','RLIKE','XOR','~','*'
-	]
-	,'DELIMITERS' :[
-		'(', ')', '[', ']', '{', '}'
-	]
-	,'REGEXPS' : {
-		// highlight all variables (@...)
-		'variables' : {
-			'search' : '()(\\@\\w+)()'
-			,'class' : 'variables'
-			,'modifiers' : 'g'
-			,'execute' : 'before' // before or after
-		}
-	}
-	,'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;'
-		,'QUOTESMARKS': 'color: #879EFA;'
-		,'KEYWORDS' : {
-			'reserved' : 'color: #48BDDF;'
-			,'functions' : 'color: #0040FD;'
-			,'statements' : 'color: #60CA00;'
-			}
-		,'OPERATORS' : 'color: #FF00FF;'
-		,'DELIMITERS' : 'color: #2B60FF;'
-		,'REGEXPS' : {
-			'variables' : 'color: #E0BD54;'
-		}		
-	}
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/tsql.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/tsql.js
deleted file mode 100644
index 2da6464d5..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/tsql.js
+++ /dev/null
@@ -1,88 +0,0 @@
-editAreaLoader.load_syntax["tsql"] = {
-	'DISPLAY_NAME' : 'T-SQL'
-	,'COMMENT_SINGLE' : {1 : '--'}
-	,'COMMENT_MULTI' : {'/*' : '*/'}
-	,'QUOTEMARKS' : {1: "'" }
-	,'KEYWORD_CASE_SENSITIVE' : false
-	,'KEYWORDS' : {
-		'statements': [
-		    'ADD', 'EXCEPT', 'PERCENT', 'EXEC', 'PLAN', 'ALTER', 'EXECUTE', 'PRECISION',
-		    'PRIMARY', 'EXIT', 'PRINT', 'AS', 'FETCH', 'PROC', 'ASC',
-		    'FILE', 'PROCEDURE', 'AUTHORIZATION', 'FILLFACTOR', 'PUBLIC', 'BACKUP', 'FOR', 'RAISERROR',
-		    'BEGIN', 'FOREIGN', 'READ', 'FREETEXT', 'READTEXT', 'BREAK', 'FREETEXTTABLE',
-		    'RECONFIGURE', 'BROWSE', 'FROM', 'REFERENCES', 'BULK', 'FULL', 'REPLICATION', 'BY',
-		    'FUNCTION', 'RESTORE', 'CASCADE', 'GOTO', 'RESTRICT', 'CASE', 'GRANT', 'RETURN',
-		    'CHECK', 'GROUP', 'REVOKE', 'CHECKPOINT', 'HAVING', 'RIGHT', 'CLOSE', 'HOLDLOCK', 'ROLLBACK',
-		    'CLUSTERED', 'IDENTITY', 'ROWCOUNT', 'IDENTITY_INSERT', 'ROWGUIDCOL', 'COLLATE', 
-		    'IDENTITYCOL', 'RULE', 'COLUMN', 'IF', 'SAVE', 'COMMIT', 'SCHEMA', 'COMPUTE', 'INDEX',
-		    'SELECT', 'CONSTRAINT', 'CONTAINS', 'INSERT', 'SET',
-		    'CONTAINSTABLE', 'INTERSECT', 'SETUSER', 'CONTINUE', 'INTO', 'SHUTDOWN', 'SOME',
-		    'CREATE', 'STATISTICS', 'KEY', 'CURRENT', 'KILL', 'TABLE',
-		    'CURRENT_DATE', 'TEXTSIZE', 'CURRENT_TIME', 'THEN', 'LINENO',
-		    'TO', 'LOAD', 'TOP', 'CURSOR', 'NATIONAL', 'TRAN', 'DATABASE', 'NOCHECK', 
-		    'TRANSACTION', 'DBCC', 'NONCLUSTERED', 'TRIGGER', 'DEALLOCATE', 'TRUNCATE',
-		    'DECLARE', 'TSEQUAL', 'DEFAULT', 'UNION', 'DELETE', 'OF', 'UNIQUE',
-		    'DENY', 'OFF', 'UPDATE', 'DESC', 'OFFSETS', 'UPDATETEXT', 'DISK', 'ON', 'USE', 'DISTINCT', 'OPEN',
-		    'DISTRIBUTED', 'OPENDATASOURCE', 'VALUES', 'DOUBLE', 'OPENQUERY', 'VARYING', 'DROP', 
-		    'OPENROWSET', 'VIEW', 'DUMMY', 'OPENXML', 'WAITFOR', 'DUMP', 'OPTION', 'WHEN', 'ELSE', 'WHERE',
-		    'END', 'ORDER', 'WHILE', 'ERRLVL', 'WITH', 'ESCAPE', 'OVER', 'WRITETEXT'
-		],
-		'functions': [
-		    'COALESCE', 'SESSION_USER', 'CONVERT', 'SYSTEM_USER', 'CURRENT_TIMESTAMP', 'CURRENT_USER', 'NULLIF', 'USER',
-			'AVG', 'MIN', 'CHECKSUM', 'SUM', 'CHECKSUM_AGG', 'STDEV', 'COUNT', 'STDEVP', 'COUNT_BIG', 'VAR', 'GROUPING', 'VARP', 'MAX',
-			'@@DATEFIRST', '@@OPTIONS', '@@DBTS', '@@REMSERVER', '@@LANGID', '@@SERVERNAME', '@@LANGUAGE', '@@SERVICENAME', '@@LOCK_TIMEOUT',
-			'@@SPID', '@@MAX_CONNECTIONS', '@@TEXTSIZE', '@@MAX_PRECISION', '@@VERSION', '@@NESTLEVEL',
-			'@@CURSOR_ROWS', 'CURSOR_STATUS', '@@FETCH_STATUS',
-			'DATEADD', 'DATEDIFF', 'DATENAME', 'DATEPART', 'DAY', 'GETDATE', 'GETUTCDATE', 'MONTH', 'YEAR',
-			'ABS', 'DEGREES', 'RAND', 'ACOS', 'EXP', 'ROUND', 'ASIN', 'FLOOR', 'SIGN', 'ATAN', 'LOG', 'SIN', 'ATN2', 'LOG10', 'SQRT',
-			'CEILING', 'PI ', 'SQUARE', 'COS', 'POWER', 'TAN', 'COT', 'RADIANS',
-			'@@PROCID', 'COL_LENGTH', 'FULLTEXTCATALOGPROPERTY', 'COL_NAME', 'FULLTEXTSERVICEPROPERTY', 'COLUMNPROPERTY', 'INDEX_COL',
-			'DATABASEPROPERTY', 'INDEXKEY_PROPERTY', 'DATABASEPROPERTYEX', 'INDEXPROPERTY', 'DB_ID', 'OBJECT_ID', 'DB_NAME', 'OBJECT_NAME',
-			'FILE_ID', 'OBJECTPROPERTY', 'OBJECTPROPERTYEX', 'FILE_NAME', 'SQL_VARIANT_PROPERTY', 'FILEGROUP_ID', 'FILEGROUP_NAME',
-			'FILEGROUPPROPERTY', 'TYPEPROPERTY', 'FILEPROPERTY',
-			'CURRENT_USER', 'SUSER_ID', 'SUSER_SID', 'IS_MEMBER', 'SUSER_SNAME', 'IS_SRVROLEMEMBER', 'PERMISSIONS', 'SYSTEM_USER',
-			'SUSER_NAME', 'USER_ID', 'SESSION_USER', 'USER_NAME', 'ASCII', 'SOUNDEX', 'PATINDEX', 'SPACE', 'CHARINDEX', 'QUOTENAME',
-			'STR', 'DIFFERENCE', 'REPLACE', 'STUFF', 'REPLICATE', 'SUBSTRING', 'LEN', 'REVERSE', 'UNICODE', 'LOWER',
-			'UPPER', 'LTRIM', 'RTRIM', 'APP_NAME', 'CAST', 'CONVERT', 'COALESCE', 'COLLATIONPROPERTY', 'COLUMNS_UPDATED', 'CURRENT_TIMESTAMP',
-			'CURRENT_USER', 'DATALENGTH', '@@ERROR', 'FORMATMESSAGE', 'GETANSINULL', 'HOST_ID', 'HOST_NAME', 'IDENT_CURRENT', 'IDENT_INCR',
-			'IDENT_SEED', '@@IDENTITY', 'ISDATE', 'ISNULL', 'ISNUMERIC', 'NEWID', 'NULLIF', 'PARSENAME', '@@ROWCOUNT',
-			'SCOPE_IDENTITY', 'SERVERPROPERTY', 'SESSIONPROPERTY', 'SESSION_USER', 'STATS_DATE', 'SYSTEM_USER', '@@TRANCOUNT', 'USER_NAME',
-			'@@CONNECTIONS', '@@PACK_RECEIVED', '@@CPU_BUSY', '@@PACK_SENT', '@@TIMETICKS', '@@IDLE', '@@TOTAL_ERRORS', '@@IO_BUSY', '@@TOTAL_READ',
-			'@@PACKET_ERRORS', '@@TOTAL_WRITE', 'PATINDEX', 'TEXTVALID', 'TEXTPTR'
-		],
-		'reserved': [
-			'RIGHT', 'INNER', 'IS', 'JOIN', 'CROSS', 'LEFT', 'NULL', 'OUTER'
-		]
-	}
-	,'OPERATORS' :[
-		'+', '-', '*', '/', '%', '=', '&' ,'|', '^', '>', '<', '>=', '<=', '<>', '!=', '!<', '!>', 'ALL', 'AND', 'ANY', 'BETWEEN', 'EXISTS', 'IN', 'LIKE', 'NOT', 'OR', '~'
-	]
-	,'DELIMITERS' :[
-		'(', ')', '[', ']', '{', '}'
-	]
-	,'REGEXPS' : {
-		// highlight all variables (@...)
-		'variables' : {
-			'search' : '()(\\@\\w+)()'
-			,'class' : 'variables'
-			,'modifiers' : 'g'
-			,'execute' : 'before' // before or after
-		}
-	}
-	,'STYLES' : {
-		'COMMENTS': 'color: #008000;'
-		,'QUOTESMARKS': 'color: #FF0000;'
-		,'KEYWORDS' : {
-			'reserved' : 'color: #808080;'
-			,'functions' : 'color: #FF00FF;'
-			,'statements' : 'color: #0000FF;'
-			}
-		,'OPERATORS' : 'color: #808080;'
-		,'DELIMITERS' : 'color: #FF8000;'
-		,'REGEXPS' : {
-			'variables' : 'color: #E0BD54;'
-		}		
-	}
-};
-
- 	  	 
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/vb.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/vb.js
deleted file mode 100644
index 6af501f0d..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/vb.js
+++ /dev/null
@@ -1,53 +0,0 @@
-editAreaLoader.load_syntax["vb"] = {
-	'DISPLAY_NAME' : 'Visual Basic'
-	,'COMMENT_SINGLE' : {1 : "'"}
-	,'COMMENT_MULTI' : { }
-	,'QUOTEMARKS' : {1: '"'}
-	,'KEYWORD_CASE_SENSITIVE' : false
-	,'KEYWORDS' : {
-		'statements' : [
-	        'if','then','for','each','while','do','loop',
-            'else','elseif','select','case','end select',
-            'until','next','step','to','in','end if'
-		]
-		,'keywords' : [
-            'empty','isempty','nothing','null','isnull','true','false',
-            'set','call',
-            'sub','end sub','function','end function','exit','exit function',
-            'dim','Mod','In','private','public','shared','const'
-        ]
-
-		,'functions' : [
-			'CDate','Date','DateAdd','DateDiff','DatePart','DateSerial','DateValue','Day','FormatDateTime',
-            'Hour','IsDate','Minute','Month',
-            'MonthName','Now','Second','Time','Timer','TimeSerial','TimeValue','Weekday','WeekdayName ','Year',
-            'Asc','CBool','CByte','CCur','CDate','CDbl','Chr','CInt','CLng','CSng','CStr','Hex','Oct','FormatCurrency',
-            'FormatDateTime','FormatNumber','FormatPercent','Abs','Atn','Cos','Exp','Hex','Int','Fix','Log','Oct',
-            'Rnd','Sgn','Sin','Sqr','Tan',
-            'Array','Filter','IsArray','Join','LBound','Split','UBound',
-            'InStr','InStrRev','LCase','Left','Len','LTrim','RTrim','Trim','Mid','Replace','Right','Space','StrComp',
-            'String','StrReverse','UCase',
-            'CreateObject','Eval','GetLocale','GetObject','GetRef','InputBox','IsEmpty','IsNull','IsNumeric',
-            'IsObject','LoadPicture','MsgBox','RGB','Round','ScriptEngine','ScriptEngineBuildVersion','ScriptEngineMajorVersion',
-            'ScriptEngineMinorVersion','SetLocale','TypeName','VarType'
-		]
-	}
-	,'OPERATORS' :[
-		'+', '-', '/', '*', '=', '<', '>', '!', '&'
-	]
-	,'DELIMITERS' :[
-		'(', ')', '[', ']', '{', '}'
-	]
-	,'STYLES' : {
-		'COMMENTS': 'color: #99CC00;'
-		,'QUOTESMARKS': 'color: #333399;'
-		,'KEYWORDS' : {
-			'keywords' : 'color: #3366FF;'
-			,'functions' : 'color: #0000FF;'
-			,'statements' : 'color: #3366FF;'
-			}
-		,'OPERATORS' : 'color: #FF0000;'
-		,'DELIMITERS' : 'color: #0000FF;'
-
-	}
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/xml.js b/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/xml.js
deleted file mode 100644
index 074d8885c..000000000
--- a/client/client-editor/src/main/resources/webapp/js/edit_area/reg_syntax/xml.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* last update: 2006-08-24
-*/
-
-editAreaLoader.load_syntax["xml"] = {
-	'DISPLAY_NAME' : 'XML'
-	,'COMMENT_SINGLE' : {}
-	,'COMMENT_MULTI' : {'<!--' : '-->'}
-	,'QUOTEMARKS' : {1: "'", 2: '"'}
-	,'KEYWORD_CASE_SENSITIVE' : false
-	,'KEYWORDS' : {
-	}
-	,'OPERATORS' :[
-	]
-	,'DELIMITERS' :[
-	]
-	,'REGEXPS' : {
-		'xml' : {
-			'search' : '()(<\\?[^>]*?\\?>)()'
-			,'class' : 'xml'
-			,'modifiers' : 'g'
-			,'execute' : 'before' // before or after
-		}
-		,'cdatas' : {
-			'search' : '()(<!\\[CDATA\\[.*?\\]\\]>)()'
-			,'class' : 'cdata'
-			,'modifiers' : 'g'
-			,'execute' : 'before' // before or after
-		}
-		,'tags' : {
-			'search' : '(<)(/?[a-z][^ \r\n\t>]*)([^>]*>)'
-			,'class' : 'tags'
-			,'modifiers' : 'gi'
-			,'execute' : 'before' // before or after
-		}
-		,'attributes' : {
-			'search' : '( |\n|\r|\t)([^ \r\n\t=]+)(=)'
-			,'class' : 'attributes'
-			,'modifiers' : 'g'
-			,'execute' : 'before' // before or after
-		}
-	}
-	,'STYLES' : {
-		'COMMENTS': 'color: #AAAAAA;'
-		,'QUOTESMARKS': 'color: #6381F8;'
-		,'KEYWORDS' : {
-			}
-		,'OPERATORS' : 'color: #E775F0;'
-		,'DELIMITERS' : ''
-		,'REGEXPS' : {
-			'attributes': 'color: #B1AC41;'
-			,'tags': 'color: #E62253;'
-			,'xml': 'color: #8DCFB5;'
-			,'cdata': 'color: #50B020;'
-		}	
-	}		
-};
diff --git a/client/client-editor/src/main/resources/webapp/js/fileMenu.js b/client/client-editor/src/main/resources/webapp/js/fileMenu.js
deleted file mode 100644
index e42a268ff..000000000
--- a/client/client-editor/src/main/resources/webapp/js/fileMenu.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/*global define,jQuery,window */
-
-(function(factory) {
-
-    "use strict";
-
-    if (typeof (define) === 'function' && define.amd) {
-        define([ 'jquery' ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function($) {
-
-    "use strict";
-
-    $.fileMenu = function(el, options) {
-
-        var base = this;
-
-        base.$el = $(el);
-        base.el = el;
-
-        base.options = $.extend({}, $.fileMenu.defaultOptions, options);
-        base.touch = false;
-
-        base.$ = function(query) {
-            return base.$el.find(query);
-        };
-
-        base.hideMenu = function() {
-            base.$('.selected ul').slideUp(base.options.slideSpeed);
-            base.$('.selected').removeClass('selected');
-            base.$el.removeClass('active');
-        };
-
-        base.showMenu = function($this) {
-            var $parent = $this.parent(), $menu = $this.children('ul').first(), offsets = $this.offset();
-
-            $parent.addClass('active');
-
-            $this.addClass('selected');
-            $menu.css({
-                'left' : offsets.left,
-                'top' : offsets.top + $parent.height()
-            });
-            $menu.slideDown(base.options.slideSpeed);
-        };
-
-        base.addListeners = function() {
-            base.$el.children('li').on('click', function(e) {
-                var $this = $(this);
-
-                if ($this.hasClass('selected')) {
-                    base.hideMenu();
-                } else {
-                    base.hideMenu();
-                    base.showMenu($this);
-                }
-                e.stopPropagation();
-            });
-
-            base.$el.children('li').on('mouseenter', function() {
-                var $this = $(this);
-                if (!$this.parent().hasClass('active')) {
-                    return;
-                }
-                if ($this.hasClass('selected')) {
-                    return;
-                }
-
-                base.hideMenu();
-                base.showMenu($this);
-            });
-
-            /* Don't slide up if submenu, divider or disabled item is clicked */
-            base.$('ul').on('click', function(e) {
-                var $this = $(e.target);
-                if ($this.get(0).tagName === 'LI' && !$this.hasClass('sub')) {
-                    return;
-                }
-                e.stopPropagation();
-            });
-
-            /* Handle toggle elements */
-            base.$('ul').on('click', '.toggle', function(e) {
-                $(this).toggleClass('active');
-                e.stopPropagation();
-            });
-
-            /* Position sub menus */
-            base.$el.on('mouseenter', 'ul li', function() {
-                var $this = $(this);
-
-                $this.find('ul').first().css({
-                    'left' : $this.parent().width(),
-                    'margin-top' : -$this.height()
-                });
-            });
-
-            /* Hide menu on click outside the menu */
-            $('html').on('click', function() {
-                base.hideMenu();
-            });
-        };
-
-        base.init = function() {
-            base.addListeners();
-            base.$el.addClass('fileMenu');
-
-        };
-
-        base.init();
-    };
-
-    $.fileMenu.defaultOptions = {
-        slideSpeed : 100
-    };
-
-    $.fn.fileMenu = function(options) {
-        return this.each(function() {
-            var fm = new $.fileMenu(this, options);
-        });
-    };
-
-}));
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/AUTHORS.txt b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/AUTHORS.txt
deleted file mode 100644
index 2f54e1b0a..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/AUTHORS.txt
+++ /dev/null
@@ -1,337 +0,0 @@
-# ! jQuery UI - v1.12.1 - 2016-09-14
-# http://jqueryui.com
-# Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-Authors ordered by first contribution
-A list of current team members is available at http://jqueryui.com/about
-
-Paul Bakaus <paul.bakaus@gmail.com>
-Richard Worth <rdworth@gmail.com>
-Yehuda Katz <wycats@gmail.com>
-Sean Catchpole <sean@sunsean.com>
-John Resig <jeresig@gmail.com>
-Tane Piper <piper.tane@gmail.com>
-Dmitri Gaskin <dmitrig01@gmail.com>
-Klaus Hartl <klaus.hartl@gmail.com>
-Stefan Petre <stefan.petre@gmail.com>
-Gilles van den Hoven <gilles@webunity.nl>
-Micheil Bryan Smith <micheil@brandedcode.com>
-Jörn Zaefferer <joern.zaefferer@gmail.com>
-Marc Grabanski <m@marcgrabanski.com>
-Keith Wood <kbwood@iinet.com.au>
-Brandon Aaron <brandon.aaron@gmail.com>
-Scott González <scott.gonzalez@gmail.com>
-Eduardo Lundgren <eduardolundgren@gmail.com>
-Aaron Eisenberger <aaronchi@gmail.com>
-Joan Piedra <theneojp@gmail.com>
-Bruno Basto <b.basto@gmail.com>
-Remy Sharp <remy@leftlogic.com>
-Bohdan Ganicky <bohdan.ganicky@gmail.com>
-David Bolter <david.bolter@gmail.com>
-Chi Cheng <cloudream@gmail.com>
-Ca-Phun Ung <pazu2k@gmail.com>
-Ariel Flesler <aflesler@gmail.com>
-Maggie Wachs <maggie@filamentgroup.com>
-Scott Jehl <scottjehl@gmail.com>
-Todd Parker <todd@filamentgroup.com>
-Andrew Powell <andrew@shellscape.org>
-Brant Burnett <btburnett3@gmail.com>
-Douglas Neiner <doug@dougneiner.com>
-Paul Irish <paul.irish@gmail.com>
-Ralph Whitbeck <ralph.whitbeck@gmail.com>
-Thibault Duplessis <thibault.duplessis@gmail.com>
-Dominique Vincent <dominique.vincent@toitl.com>
-Jack Hsu <jack.hsu@gmail.com>
-Adam Sontag <ajpiano@ajpiano.com>
-Carl Fürstenberg <carl@excito.com>
-Kevin Dalman <development@allpro.net>
-Alberto Fernández Capel <afcapel@gmail.com>
-Jacek Jędrzejewski (http://jacek.jedrzejewski.name)
-Ting Kuei <ting@kuei.com>
-Samuel Cormier-Iijima <sam@chide.it>
-Jon Palmer <jonspalmer@gmail.com>
-Ben Hollis <bhollis@amazon.com>
-Justin MacCarthy <Justin@Rubystars.biz>
-Eyal Kobrigo <kobrigo@hotmail.com>
-Tiago Freire <tiago.freire@gmail.com>
-Diego Tres <diegotres@gmail.com>
-Holger Rüprich <holger@rueprich.de>
-Ziling Zhao <zilingzhao@gmail.com>
-Mike Alsup <malsup@gmail.com>
-Robson Braga Araujo <robsonbraga@gmail.com>
-Pierre-Henri Ausseil <ph.ausseil@gmail.com>
-Christopher McCulloh <cmcculloh@gmail.com>
-Andrew Newcomb <ext.github@preceptsoftware.co.uk>
-Lim Chee Aun <cheeaun@gmail.com>
-Jorge Barreiro <yortx.barry@gmail.com>
-Daniel Steigerwald <daniel@steigerwald.cz>
-John Firebaugh <john_firebaugh@bigfix.com>
-John Enters <github@darkdark.net>
-Andrey Kapitcyn <ru.m157y@gmail.com>
-Dmitry Petrov <dpetroff@gmail.com>
-Eric Hynds <eric@hynds.net>
-Chairat Sunthornwiphat <pipo@sixhead.com>
-Josh Varner <josh.varner@gmail.com>
-Stéphane Raimbault <stephane.raimbault@gmail.com>
-Jay Merrifield <fracmak@gmail.com>
-J. Ryan Stinnett <jryans@gmail.com>
-Peter Heiberg <peter@heiberg.se>
-Alex Dovenmuehle <adovenmuehle@gmail.com>
-Jamie Gegerson <git@jamiegegerson.com>
-Raymond Schwartz <skeetergraphics@gmail.com>
-Phillip Barnes <philbar@gmail.com>
-Kyle Wilkinson <kai@wikyd.org>
-Khaled AlHourani <me@khaledalhourani.com>
-Marian Rudzynski <mr@impaled.org>
-Jean-Francois Remy <jeff@melix.org>
-Doug Blood <dougblood@gmail.com>
-Filippo Cavallarin <filippo.cavallarin@codseq.it>
-Heiko Henning <heiko@thehennings.ch>
-Aliaksandr Rahalevich <saksmlz@gmail.com>
-Mario Visic <mario@mariovisic.com>
-Xavi Ramirez <xavi.rmz@gmail.com>
-Max Schnur <max.schnur@gmail.com>
-Saji Nediyanchath <saji89@gmail.com>
-Corey Frang <gnarf37@gmail.com>
-Aaron Peterson <aaronp123@yahoo.com>
-Ivan Peters <ivan@ivanpeters.com>
-Mohamed Cherif Bouchelaghem <cherifbouchelaghem@yahoo.fr>
-Marcos Sousa <falecomigo@marcossousa.com>
-Michael DellaNoce <mdellanoce@mailtrust.com>
-George Marshall <echosx@gmail.com>
-Tobias Brunner <tobias@strongswan.org>
-Martin Solli <msolli@gmail.com>
-David Petersen <public@petersendidit.com>
-Dan Heberden <danheberden@gmail.com>
-William Kevin Manire <williamkmanire@gmail.com>
-Gilmore Davidson <gilmoreorless@gmail.com>
-Michael Wu <michaelmwu@gmail.com>
-Adam Parod <mystic414@gmail.com>
-Guillaume Gautreau <guillaume+github@ghusse.com>
-Marcel Toele <EleotleCram@gmail.com>
-Dan Streetman <ddstreet@ieee.org>
-Matt Hoskins <matt@nipltd.com>
-Giovanni Giacobbi <giovanni@giacobbi.net>
-Kyle Florence <kyle.florence@gmail.com>
-Pavol Hluchý <lopo@losys.sk>
-Hans Hillen <hans.hillen@gmail.com>
-Mark Johnson <virgofx@live.com>
-Trey Hunner <treyhunner@gmail.com>
-Shane Whittet <whittet@gmail.com>
-Edward A Faulkner <ef@alum.mit.edu>
-Adam Baratz <adam@adambaratz.com>
-Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
-Eike Send <eike.send@gmail.com>
-Kris Borchers <kris.borchers@gmail.com>
-Eddie Monge <eddie@eddiemonge.com>
-Israel Tsadok <itsadok@gmail.com>
-Carson McDonald <carson@ioncannon.net>
-Jason Davies <jason@jasondavies.com>
-Garrison Locke <gplocke@gmail.com>
-David Murdoch <david@davidmurdoch.com>
-Benjamin Scott Boyle <benjamins.boyle@gmail.com>
-Jesse Baird <jebaird@gmail.com>
-Jonathan Vingiano <jvingiano@gmail.com>
-Dylan Just <dev@ephox.com>
-Hiroshi Tomita <tomykaira@gmail.com>
-Glenn Goodrich <glenn.goodrich@gmail.com>
-Tarafder Ashek-E-Elahi <mail.ashek@gmail.com>
-Ryan Neufeld <ryan@neufeldmail.com>
-Marc Neuwirth <marc.neuwirth@gmail.com>
-Philip Graham <philip.robert.graham@gmail.com>
-Benjamin Sterling <benjamin.sterling@kenzomedia.com>
-Wesley Walser <waw325@gmail.com>
-Kouhei Sutou <kou@clear-code.com>
-Karl Kirch <karlkrch@gmail.com>
-Chris Kelly <ckdake@ckdake.com>
-Jason Oster <jay@kodewerx.org>
-Felix Nagel <info@felixnagel.com>
-Alexander Polomoshnov <alex.polomoshnov@gmail.com>
-David Leal <dgleal@gmail.com>
-Igor Milla <igor.fsp.milla@gmail.com>
-Dave Methvin <dave.methvin@gmail.com>
-Florian Gutmann <f.gutmann@chronimo.com>
-Marwan Al Jubeh <marwan.aljubeh@gmail.com>
-Milan Broum <midlis@googlemail.com>
-Sebastian Sauer <info@dynpages.de>
-Gaëtan Muller <m.gaetan89@gmail.com>
-Michel Weimerskirch <michel@weimerskirch.net>
-William Griffiths <william@ycymro.com>
-Stojce Slavkovski <stojce@gmail.com>
-David Soms <david.soms@gmail.com>
-David De Sloovere <david.desloovere@outlook.com>
-Michael P. Jung <michael.jung@terreon.de>
-Shannon Pekary <spekary@gmail.com>
-Dan Wellman <danwellman@hotmail.com>
-Matthew Edward Hutton <meh@corefiling.co.uk>
-James Khoury <james@jameskhoury.com>
-Rob Loach <robloach@gmail.com>
-Alberto Monteiro <betimbrasil@gmail.com>
-Alex Rhea <alex.rhea@gmail.com>
-Krzysztof Rosiński <rozwell69@gmail.com>
-Ryan Olton <oltonr@gmail.com>
-Genie <386@mail.com>
-Rick Waldron <waldron.rick@gmail.com>
-Ian Simpson <spoonlikesham@gmail.com>
-Lev Kitsis <spam4lev@gmail.com>
-TJ VanToll <tj.vantoll@gmail.com>
-Justin Domnitz <jdomnitz@gmail.com>
-Douglas Cerna <douglascerna@yahoo.com>
-Bert ter Heide <bertjh@hotmail.com>
-Jasvir Nagra <jasvir@gmail.com>
-Yuriy Khabarov <13real008@gmail.com>
-Harri Kilpiö <harri.kilpio@gmail.com>
-Lado Lomidze <lado.lomidze@gmail.com>
-Amir E. Aharoni <amir.aharoni@mail.huji.ac.il>
-Simon Sattes <simon.sattes@gmail.com>
-Jo Liss <joliss42@gmail.com>
-Guntupalli Karunakar <karunakarg@yahoo.com>
-Shahyar Ghobadpour <shahyar@gmail.com>
-Lukasz Lipinski <uzza17@gmail.com>
-Timo Tijhof <krinklemail@gmail.com>
-Jason Moon <jmoon@socialcast.com>
-Martin Frost <martinf55@hotmail.com>
-Eneko Illarramendi <eneko@illarra.com>
-EungJun Yi <semtlenori@gmail.com>
-Courtland Allen <courtlandallen@gmail.com>
-Viktar Varvanovich <non4eg@gmail.com>
-Danny Trunk <dtrunk90@gmail.com>
-Pavel Stetina <pavel.stetina@nangu.tv>
-Michael Stay <metaweta@gmail.com>
-Steven Roussey <sroussey@gmail.com>
-Michael Hollis <hollis21@gmail.com>
-Lee Rowlands <lee.rowlands@previousnext.com.au>
-Timmy Willison <timmywillisn@gmail.com>
-Karl Swedberg <kswedberg@gmail.com>
-Baoju Yuan <the_guy_1987@hotmail.com>
-Maciej Mroziński <maciej.k.mrozinski@gmail.com>
-Luis Dalmolin <luis.nh@gmail.com>
-Mark Aaron Shirley <maspwr@gmail.com>
-Martin Hoch <martin@fidion.de>
-Jiayi Yang <tr870829@gmail.com>
-Philipp Benjamin Köppchen <xgxtpbk@gws.ms>
-Sindre Sorhus <sindresorhus@gmail.com>
-Bernhard Sirlinger <bernhard.sirlinger@tele2.de>
-Jared A. Scheel <jared@jaredscheel.com>
-Rafael Xavier de Souza <rxaviers@gmail.com>
-John Chen <zhang.z.chen@intel.com>
-Robert Beuligmann <robertbeuligmann@gmail.com>
-Dale Kocian <dale.kocian@gmail.com>
-Mike Sherov <mike.sherov@gmail.com>
-Andrew Couch <andy@couchand.com>
-Marc-Andre Lafortune <github@marc-andre.ca>
-Nate Eagle <nate.eagle@teamaol.com>
-David Souther <davidsouther@gmail.com>
-Mathias Stenbom <mathias@stenbom.com>
-Sergey Kartashov <ebishkek@yandex.ru>
-Avinash R <nashpapa@gmail.com>
-Ethan Romba <ethanromba@gmail.com>
-Cory Gackenheimer <cory.gack@gmail.com>
-Juan Pablo Kaniefsky <jpkaniefsky@gmail.com>
-Roman Salnikov <bardt.dz@gmail.com>
-Anika Henke <anika@selfthinker.org>
-Samuel Bovée <samycookie2000@yahoo.fr>
-Fabrício Matté <ult_combo@hotmail.com>
-Viktor Kojouharov <vkojouharov@gmail.com>
-Pawel Maruszczyk (http://hrabstwo.net)
-Pavel Selitskas <p.selitskas@gmail.com>
-Bjørn Johansen <post@bjornjohansen.no>
-Matthieu Penant <thieum22@hotmail.com>
-Dominic Barnes <dominic@dbarnes.info>
-David Sullivan <david.sullivan@gmail.com>
-Thomas Jaggi <thomas@responsive.ch>
-Vahid Sohrabloo <vahid4134@gmail.com>
-Travis Carden <travis.carden@gmail.com>
-Bruno M. Custódio <bruno@brunomcustodio.com>
-Nathanael Silverman <nathanael.silverman@gmail.com>
-Christian Wenz <christian@wenz.org>
-Steve Urmston <steve@urm.st>
-Zaven Muradyan <megalivoithos@gmail.com>
-Woody Gilk <shadowhand@deviantart.com>
-Zbigniew Motyka <zbigniew.motyka@gmail.com>
-Suhail Alkowaileet <xsoh.k7@gmail.com>
-Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
-David Hansen <hansede@gmail.com>
-Brian Grinstead <briangrinstead@gmail.com>
-Christian Klammer <christian314159@gmail.com>
-Steven Luscher <jquerycla@steveluscher.com>
-Gan Eng Chin <engchin.gan@gmail.com>
-Gabriel Schulhof <gabriel.schulhof@intel.com>
-Alexander Schmitz <arschmitz@gmail.com>
-Vilhjálmur Skúlason <vis@dmm.is>
-Siebrand Mazeland <siebrand@kitano.nl>
-Mohsen Ekhtiari <mohsenekhtiari@yahoo.com>
-Pere Orga <gotrunks@gmail.com>
-Jasper de Groot <mail@ugomobi.com>
-Stephane Deschamps <stephane.deschamps@gmail.com>
-Jyoti Deka <dekajp@gmail.com>
-Andrei Picus <office.nightcrawler@gmail.com>
-Ondrej Novy <novy@ondrej.org>
-Jacob McCutcheon <jacob.mccutcheon@gmail.com>
-Monika Piotrowicz <monika.piotrowicz@gmail.com>
-Imants Horsts <imants.horsts@inbox.lv>
-Eric Dahl <eric.c.dahl@gmail.com>
-Dave Stein <dave@behance.com>
-Dylan Barrell <dylan@barrell.com>
-Daniel DeGroff <djdegroff@gmail.com>
-Michael Wiencek <mwtuea@gmail.com>
-Thomas Meyer <meyertee@gmail.com>
-Ruslan Yakhyaev <ruslan@ruslan.io>
-Brian J. Dowling <bjd-dev@simplicity.net>
-Ben Higgins <ben@extrahop.com>
-Yermo Lamers <yml@yml.com>
-Patrick Stapleton <github@gdi2290.com>
-Trisha Crowley <trisha.crowley@gmail.com>
-Usman Akeju <akeju00+github@gmail.com>
-Rodrigo Menezes <rod333@gmail.com>
-Jacques Perrault <jacques_perrault@us.ibm.com>
-Frederik Elvhage <frederik.elvhage@googlemail.com>
-Will Holley <willholley@gmail.com>
-Uri Gilad <antishok@gmail.com>
-Richard Gibson <richard.gibson@gmail.com>
-Simen Bekkhus <sbekkhus91@gmail.com>
-Chen Eshchar <eshcharc@gmail.com>
-Bruno Pérel <brunoperel@gmail.com>
-Mohammed Alshehri <m@dralshehri.com>
-Lisa Seacat DeLuca <ldeluca@us.ibm.com>
-Anne-Gaelle Colom <coloma@westminster.ac.uk>
-Adam Foster <slimfoster@gmail.com>
-Luke Page <luke.a.page@gmail.com>
-Daniel Owens <daniel@matchstickmixup.com>
-Michael Orchard <morchard@scottlogic.co.uk>
-Marcus Warren <marcus@envoke.com>
-Nils Heuermann <nils@world-of-scripts.de>
-Marco Ziech <marco@ziech.net>
-Patricia Juarez <patrixd@gmail.com>
-Ben Mosher <me@benmosher.com>
-Ablay Keldibek <atomio.ak@gmail.com>
-Thomas Applencourt <thomas.applencourt@irsamc.ups-tlse.fr>
-Jiabao Wu <jiabao.foss@gmail.com>
-Eric Lee Carraway <github@ericcarraway.com>
-Victor Homyakov <vkhomyackov@gmail.com>
-Myeongjin Lee <aranet100@gmail.com>
-Liran Sharir <lsharir@gmail.com>
-Weston Ruter <weston@xwp.co>
-Mani Mishra <manimishra902@gmail.com>
-Hannah Methvin <hannahmethvin@gmail.com>
-Leonardo Balter <leonardo.balter@gmail.com>
-Benjamin Albert <benjamin_a5@yahoo.com>
-Michał Gołębiowski <m.goleb@gmail.com>
-Alyosha Pushak <alyosha.pushak@gmail.com>
-Fahad Ahmad <fahadahmad41@hotmail.com>
-Matt Brundage <github@mattbrundage.com>
-Francesc Baeta <francesc.baeta@gmail.com>
-Piotr Baran <piotros@wp.pl>
-Mukul Hase <mukulhase@gmail.com>
-Konstantin Dinev <kdinev@mail.bw.edu>
-Rand Scullard <rand@randscullard.com>
-Dan Strohl <dan@wjcg.net>
-Maksim Ryzhikov <rv.maksim@gmail.com>
-Amine HADDAD <haddad@allegorie.tv>
-Amanpreet Singh <apsdehal@gmail.com>
-Alexey Balchunas <bleshik@gmail.com>
-Peter Kehl <peter.kehl@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Johannes Schäfer <johnschaefer@gmx.de>
-Ville Skyttä <ville.skytta@iki.fi>
-Ryan Oriecuia <ryan.oriecuia@visioncritical.com>
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/LICENSE.txt b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/LICENSE.txt
deleted file mode 100644
index 4819e5421..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/LICENSE.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-Copyright jQuery Foundation and other contributors, https://jquery.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/jquery/jquery-ui
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-Copyright and related rights for sample code are waived via CC0. Sample
-code is defined as all source code contained within the demos directory.
-
-CC0: http://creativecommons.org/publicdomain/zero/1.0/
-
-====
-
-All files located in the node_modules and external directories are
-externally maintained libraries used by this software which have their
-own licenses; we recommend you read them, as their terms may differ from
-the terms above.
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/external/jquery/jquery.js b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/external/jquery/jquery.js
deleted file mode 100644
index a1c07fd80..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/external/jquery/jquery.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}k.fn=k.prototype={jquery:f,constructor:k,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=k.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return k.each(this,e)},map:function(n){return this.pushStack(k.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},k.extend=k.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(k.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||k.isPlainObject(n)?n:{},i=!1,a[t]=k.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},k.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t){b(e,{nonce:t&&t.nonce})},each:function(e,t){var n,r=0;if(d(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(p,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(d(Object(e))?k.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(d(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g.apply([],a)},guid:1,support:y}),"function"==typeof Symbol&&(k.fn[Symbol.iterator]=t[Symbol.iterator]),k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var h=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,k="sizzle"+1*new Date,m=n.document,S=0,r=0,p=ue(),x=ue(),N=ue(),A=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",$=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",F=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="<a id='"+k+"'></a><select id='"+k+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!==C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!==C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(F," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[S,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[S,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[k]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[k]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[S,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[k]||(e[k]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===S&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[k]&&(v=Ce(v)),y&&!y[k]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[k]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=N[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[k]?i.push(a):o.push(a);(a=N(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=S+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t===C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument===C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(S=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(S=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=k.split("").sort(D).join("")===k,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);k.find=h,k.expr=h.selectors,k.expr[":"]=k.expr.pseudos,k.uniqueSort=k.unique=h.uniqueSort,k.text=h.getText,k.isXMLDoc=h.isXML,k.contains=h.contains,k.escapeSelector=h.escape;var T=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&k(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},N=k.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1<i.call(n,e)!==r}):k.filter(n,e,r)}k.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?k.find.matchesSelector(r,e)?[r]:[]:k.find.matches(e,k.grep(t,function(e){return 1===e.nodeType}))},k.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(k(e).filter(function(){for(t=0;t<r;t++)if(k.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)k.find(e,i[t],n);return 1<r?k.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&N.test(e)?k(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(k.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&k(e);if(!N.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&k.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?k.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(k(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(k.uniqueSort(k.merge(this.get(),k(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),k.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return T(e,"parentNode")},parentsUntil:function(e,t,n){return T(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return T(e,"nextSibling")},prevAll:function(e){return T(e,"previousSibling")},nextUntil:function(e,t,n){return T(e,"nextSibling",n)},prevUntil:function(e,t,n){return T(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return"undefined"!=typeof e.contentDocument?e.contentDocument:(A(e,"template")&&(e=e.content||e),k.merge([],e.childNodes))}},function(r,i){k.fn[r]=function(e,t){var n=k.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=k.filter(t,n)),1<this.length&&(O[r]||k.uniqueSort(n),H.test(r)&&n.reverse()),this.pushStack(n)}});var R=/[^\x20\t\r\n\f]+/g;function M(e){return e}function I(e){throw e}function W(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}k.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},k.each(e.match(R)||[],function(e,t){n[t]=!0}),n):k.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){k.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return k.each(arguments,function(e,t){var n;while(-1<(n=k.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<k.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},k.extend({Deferred:function(e){var o=[["notify","progress",k.Callbacks("memory"),k.Callbacks("memory"),2],["resolve","done",k.Callbacks("once memory"),k.Callbacks("once memory"),0,"resolved"],["reject","fail",k.Callbacks("once memory"),k.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return k.Deferred(function(r){k.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,M,s),l(u,o,I,s)):(u++,t.call(e,l(u,o,M,s),l(u,o,I,s),l(u,o,M,o.notifyWith))):(a!==M&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){k.Deferred.exceptionHook&&k.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==I&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(k.Deferred.getStackHook&&(t.stackTrace=k.Deferred.getStackHook()),C.setTimeout(t))}}return k.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:M,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:M)),o[2][3].add(l(0,e,m(n)?n:I))}).promise()},promise:function(e){return null!=e?k.extend(e,a):a}},s={};return k.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=k.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(W(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)W(i[t],a(t),o.reject);return o.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;k.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&$.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},k.readyException=function(e){C.setTimeout(function(){throw e})};var F=k.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),k.ready()}k.fn.ready=function(e){return F.then(e)["catch"](function(e){k.readyException(e)}),this},k.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--k.readyWait:k.isReady)||(k.isReady=!0)!==e&&0<--k.readyWait||F.resolveWith(E,[k])}}),k.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(k.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var _=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)_(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(k(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},z=/^-ms-/,U=/-([a-z])/g;function X(e,t){return t.toUpperCase()}function V(e){return e.replace(z,"ms-").replace(U,X)}var G=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Y(){this.expando=k.expando+Y.uid++}Y.uid=1,Y.prototype={cache:function(e){var t=e[this.expando];return t||(t={},G(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[V(t)]=n;else for(r in t)i[V(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][V(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(V):(t=V(t))in r?[t]:t.match(R)||[]).length;while(n--)delete r[t[n]]}(void 0===t||k.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!k.isEmptyObject(t)}};var Q=new Y,J=new Y,K=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function ee(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Z,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:K.test(i)?JSON.parse(i):i)}catch(e){}J.set(e,t,n)}else n=void 0;return n}k.extend({hasData:function(e){return J.hasData(e)||Q.hasData(e)},data:function(e,t,n){return J.access(e,t,n)},removeData:function(e,t){J.remove(e,t)},_data:function(e,t,n){return Q.access(e,t,n)},_removeData:function(e,t){Q.remove(e,t)}}),k.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=J.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=V(r.slice(5)),ee(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){J.set(this,n)}):_(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=J.get(o,n))?t:void 0!==(t=ee(o,n))?t:void 0;this.each(function(){J.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),k.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Q.get(e,t),n&&(!r||Array.isArray(n)?r=Q.access(e,t,k.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=k.queue(e,t),r=n.length,i=n.shift(),o=k._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){k.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Q.get(e,n)||Q.access(e,n,{empty:k.Callbacks("once memory").add(function(){Q.remove(e,[t+"queue",n])})})}}),k.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?k.queue(this[0],t):void 0===n?this:this.each(function(){var e=k.queue(this,t,n);k._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&k.dequeue(this,t)})},dequeue:function(e){return this.each(function(){k.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=k.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Q.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var te=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ne=new RegExp("^(?:([+-])=|)("+te+")([a-z%]*)$","i"),re=["Top","Right","Bottom","Left"],ie=E.documentElement,oe=function(e){return k.contains(e.ownerDocument,e)},ae={composed:!0};ie.getRootNode&&(oe=function(e){return k.contains(e.ownerDocument,e)||e.getRootNode(ae)===e.ownerDocument});var se=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&oe(e)&&"none"===k.css(e,"display")},ue=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];for(o in i=n.apply(e,r||[]),t)e.style[o]=a[o];return i};function le(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return k.css(e,t,"")},u=s(),l=n&&n[3]||(k.cssNumber[t]?"":"px"),c=e.nodeType&&(k.cssNumber[t]||"px"!==l&&+u)&&ne.exec(k.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)k.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,k.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ce={};function fe(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Q.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&se(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ce[s])||(o=a.body.appendChild(a.createElement(s)),u=k.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ce[s]=u)))):"none"!==n&&(l[c]="none",Q.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}k.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){se(this)?k(this).show():k(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Q.set(e[n],"globalEval",!t||Q.get(t[n],"globalEval"))}ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;var me,xe,be=/<|&#?\w+;/;function we(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))k.merge(p,o.nodeType?[o]:o);else if(be.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+k.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;k.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<k.inArray(o,r))i&&i.push(o);else if(l=oe(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}me=E.createDocumentFragment().appendChild(E.createElement("div")),(xe=E.createElement("input")).setAttribute("type","radio"),xe.setAttribute("checked","checked"),xe.setAttribute("name","t"),me.appendChild(xe),y.checkClone=me.cloneNode(!0).cloneNode(!0).lastChild.checked,me.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t<arguments.length;t++)u[t]=arguments[t];if(s.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,s)){a=k.event.handlers.call(this,s,l),t=0;while((i=a[t++])&&!s.isPropagationStopped()){s.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!s.isImmediatePropagationStopped())s.rnamespace&&!1!==o.namespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((k.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,s),s.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<k(i,this).index(l):k.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(k.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[k.expando]?e:new k.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click",ke),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Q.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},k.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},k.Event=function(e,t){if(!(this instanceof k.Event))return new k.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?ke:Se,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&k.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[k.expando]=!0},k.Event.prototype={constructor:k.Event,isDefaultPrevented:Se,isPropagationStopped:Se,isImmediatePropagationStopped:Se,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=ke,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=ke,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=ke,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},k.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&Te.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Ce.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},k.event.addProp),k.each({focus:"focusin",blur:"focusout"},function(e,t){k.event.special[e]={setup:function(){return De(this,e,Ne),!1},trigger:function(){return De(this,e),!0},delegateType:t}}),k.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){k.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||k.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),k.fn.extend({on:function(e,t,n,r){return Ae(this,e,t,n,r)},one:function(e,t,n,r){return Ae(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,k(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Se),this.each(function(){k.event.remove(this,e,n,t)})}});var je=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/<script|<style|<link/i,Le=/checked\s*(?:[^=]|=\s*.checked.)/i,He=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n<r;n++)k.event.add(t,i,l[i][n]);J.hasData(e)&&(s=J.access(e),u=k.extend({},s),J.set(t,u))}}function Ie(n,r,i,o){r=g.apply([],r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Le.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Ie(t,r,i,o)});if(f&&(t=(e=we(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=k.map(ve(e,"script"),Pe)).length;c<f;c++)u=e,c!==p&&(u=k.clone(u,!0,!0),s&&k.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,k.map(a,Re),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Q.access(u,"globalEval")&&k.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?k._evalUrl&&!u.noModule&&k._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")}):b(u.textContent.replace(He,""),u,l))}return n}function We(e,t,n){for(var r,i=t?k.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||k.cleanData(ve(r)),r.parentNode&&(n&&oe(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}k.extend({htmlPrefilter:function(e){return e.replace(je,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Me(o[r],a[r]);else Me(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=k.event.special,o=0;void 0!==(n=e[o]);o++)if(G(n)){if(t=n[Q.expando]){if(t.events)for(r in t.events)i[r]?k.event.remove(n,r):k.removeEvent(n,r,t.handle);n[Q.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),k.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return _(this,function(e){return void 0===e?k.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Ie(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Oe(this,e).appendChild(e)})},prepend:function(){return Ie(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Oe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(k.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return k.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!qe.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=k.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(k.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Ie(this,arguments,function(e){var t=this.parentNode;k.inArray(this,n)<0&&(k.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),k.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){k.fn[e]=function(e){for(var t,n=[],r=k(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),k(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var $e=new RegExp("^("+te+")(?!px)[a-z%]+$","i"),Fe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Be=new RegExp(re.join("|"),"i");function _e(e,t,n){var r,i,o,a,s=e.style;return(n=n||Fe(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||oe(e)||(a=k.style(e,t)),!y.pixelBoxStyles()&&$e.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function ze(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(u){s.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",u.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",ie.appendChild(s).appendChild(u);var e=C.getComputedStyle(u);n="1%"!==e.top,a=12===t(e.marginLeft),u.style.right="60%",o=36===t(e.right),r=36===t(e.width),u.style.position="absolute",i=12===t(u.offsetWidth/3),ie.removeChild(s),u=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s=E.createElement("div"),u=E.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===u.style.backgroundClip,k.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),a},scrollboxSize:function(){return e(),i}}))}();var Ue=["Webkit","Moz","ms"],Xe=E.createElement("div").style,Ve={};function Ge(e){var t=k.cssProps[e]||Ve[e];return t||(e in Xe?e:Ve[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Ue.length;while(n--)if((e=Ue[n]+t)in Xe)return e}(e)||e)}var Ye=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},Ke={letterSpacing:"0",fontWeight:"400"};function Ze(e,t,n){var r=ne.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function et(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=k.css(e,n+re[a],!0,i)),r?("content"===n&&(u-=k.css(e,"padding"+re[a],!0,i)),"margin"!==n&&(u-=k.css(e,"border"+re[a]+"Width",!0,i))):(u+=k.css(e,"padding"+re[a],!0,i),"padding"!==n?u+=k.css(e,"border"+re[a]+"Width",!0,i):s+=k.css(e,"border"+re[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function tt(e,t,n){var r=Fe(e),i=(!y.boxSizingReliable()||n)&&"border-box"===k.css(e,"boxSizing",!1,r),o=i,a=_e(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if($e.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===k.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===k.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+et(e,t,n||(i?"border":"content"),o,r,a)+"px"}function nt(e,t,n,r,i){return new nt.prototype.init(e,t,n,r,i)}k.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=_e(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=V(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=k.cssHooks[t]||k.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=ne.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(k.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=V(t);return Qe.test(t)||(t=Ge(s)),(a=k.cssHooks[t]||k.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=_e(e,t,r)),"normal"===i&&t in Ke&&(i=Ke[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),k.each(["height","width"],function(e,u){k.cssHooks[u]={get:function(e,t,n){if(t)return!Ye.test(k.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?tt(e,u,n):ue(e,Je,function(){return tt(e,u,n)})},set:function(e,t,n){var r,i=Fe(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===k.css(e,"boxSizing",!1,i),s=n?et(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-et(e,u,"border",!1,i)-.5)),s&&(r=ne.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=k.css(e,u)),Ze(0,t,s)}}}),k.cssHooks.marginLeft=ze(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(_e(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),k.each({margin:"",padding:"",border:"Width"},function(i,o){k.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+re[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(k.cssHooks[i+o].set=Ze)}),k.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a<i;a++)o[t[a]]=k.css(e,t[a],!1,r);return o}return void 0!==n?k.style(e,t,n):k.css(e,t)},e,t,1<arguments.length)}}),((k.Tween=nt).prototype={constructor:nt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||k.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(k.cssNumber[n]?"":"px")},cur:function(){var e=nt.propHooks[this.prop];return e&&e.get?e.get(this):nt.propHooks._default.get(this)},run:function(e){var t,n=nt.propHooks[this.prop];return this.options.duration?this.pos=t=k.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):nt.propHooks._default.set(this),this}}).init.prototype=nt.prototype,(nt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=k.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){k.fx.step[e.prop]?k.fx.step[e.prop](e):1!==e.elem.nodeType||!k.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:k.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=nt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},k.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},k.fx=nt.prototype.init,k.fx.step={};var rt,it,ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){it&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(lt):C.setTimeout(lt,k.fx.interval),k.fx.tick())}function ct(){return C.setTimeout(function(){rt=void 0}),rt=Date.now()}function ft(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=re[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function pt(e,t,n){for(var r,i=(dt.tweeners[t]||[]).concat(dt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function dt(o,e,t){var n,a,r=0,i=dt.prefilters.length,s=k.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=rt||ct(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:k.extend({},e),opts:k.extend(!0,{specialEasing:{},easing:k.easing._default},t),originalProperties:e,originalOptions:t,startTime:rt||ct(),duration:t.duration,tweens:[],createTween:function(e,t){var n=k.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=V(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=k.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=dt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(k._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return k.map(c,pt,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),k.fx.timer(k.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}k.Animation=k.extend(dt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return le(n.elem,e,ne.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(R);for(var n,r=0,i=e.length;r<i;r++)n=e[r],dt.tweeners[n]=dt.tweeners[n]||[],dt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&se(e),v=Q.get(e,"fxshow");for(r in n.queue||(null==(a=k._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,k.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],st.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||k.style(e,r)}if((u=!k.isEmptyObject(t))||!k.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Q.get(e,"display")),"none"===(c=k.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=k.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===k.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Q.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&fe([e],!0),p.done(function(){for(r in g||fe([e]),Q.remove(e,"fxshow"),d)k.style(e,r,d[r])})),u=pt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?dt.prefilters.unshift(e):dt.prefilters.push(e)}}),k.speed=function(e,t,n){var r=e&&"object"==typeof e?k.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return k.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in k.fx.speeds?r.duration=k.fx.speeds[r.duration]:r.duration=k.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&k.dequeue(this,r.queue)},r},k.fn.extend({fadeTo:function(e,t,n,r){return this.filter(se).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=k.isEmptyObject(t),o=k.speed(e,n,r),a=function(){var e=dt(this,k.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&!1!==i&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=k.timers,r=Q.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&ut.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||k.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Q.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=k.timers,o=n?n.length:0;for(t.finish=!0,k.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),k.each(["toggle","show","hide"],function(e,r){var i=k.fn[r];k.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(ft(r,!0),e,t,n)}}),k.each({slideDown:ft("show"),slideUp:ft("hide"),slideToggle:ft("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){k.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),k.timers=[],k.fx.tick=function(){var e,t=0,n=k.timers;for(rt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||k.fx.stop(),rt=void 0},k.fx.timer=function(e){k.timers.push(e),k.fx.start()},k.fx.interval=13,k.fx.start=function(){it||(it=!0,lt())},k.fx.stop=function(){it=null},k.fx.speeds={slow:600,fast:200,_default:400},k.fn.delay=function(r,e){return r=k.fx&&k.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},ot=E.createElement("input"),at=E.createElement("select").appendChild(E.createElement("option")),ot.type="checkbox",y.checkOn=""!==ot.value,y.optSelected=at.selected,(ot=E.createElement("input")).value="t",ot.type="radio",y.radioValue="t"===ot.value;var ht,gt=k.expr.attrHandle;k.fn.extend({attr:function(e,t){return _(this,k.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){k.removeAttr(this,e)})}}),k.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?k.prop(e,t,n):(1===o&&k.isXMLDoc(e)||(i=k.attrHooks[t.toLowerCase()]||(k.expr.match.bool.test(t)?ht:void 0)),void 0!==n?null===n?void k.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=k.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(R);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ht={set:function(e,t,n){return!1===t?k.removeAttr(e,n):e.setAttribute(n,n),n}},k.each(k.expr.match.bool.source.match(/\w+/g),function(e,t){var a=gt[t]||k.find.attr;gt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=gt[o],gt[o]=r,r=null!=a(e,t,n)?o:null,gt[o]=i),r}});var vt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function mt(e){return(e.match(R)||[]).join(" ")}function xt(e){return e.getAttribute&&e.getAttribute("class")||""}function bt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(R)||[]}k.fn.extend({prop:function(e,t){return _(this,k.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[k.propFix[e]||e]})}}),k.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&k.isXMLDoc(e)||(t=k.propFix[t]||t,i=k.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=k.find.attr(e,"tabindex");return t?parseInt(t,10):vt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(k.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),k.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){k.propFix[this.toLowerCase()]=this}),k.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).addClass(t.call(this,e,xt(this)))});if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).removeClass(t.call(this,e,xt(this)))});if(!arguments.length)return this.attr("class","");if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){k(this).toggleClass(i.call(this,e,xt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=k(this),r=bt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=xt(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Q.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+mt(xt(n))+" ").indexOf(t))return!0;return!1}});var wt=/\r/g;k.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,k(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=k.map(t,function(e){return null==e?"":e+""})),(r=k.valHooks[this.type]||k.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=k.valHooks[t.type]||k.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(wt,""):null==e?"":e:void 0}}),k.extend({valHooks:{option:{get:function(e){var t=k.find.attr(e,"value");return null!=t?t:mt(k.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=k(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=k.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<k.inArray(k.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),k.each(["radio","checkbox"],function(){k.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<k.inArray(k(e).val(),t)}},y.checkOn||(k.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var Tt=/^(?:focusinfocus|focusoutblur)$/,Ct=function(e){e.stopPropagation()};k.extend(k.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!Tt.test(d+k.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[k.expando]?e:new k.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:k.makeArray(t,[e]),c=k.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,Tt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Q.get(o,"events")||{})[e.type]&&Q.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&G(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!G(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),k.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Ct),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Ct),k.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=k.extend(new k.Event,n,{type:e,isSimulated:!0});k.event.trigger(r,null,t)}}),k.fn.extend({trigger:function(e,t){return this.each(function(){k.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return k.event.trigger(e,t,n,!0)}}),y.focusin||k.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){k.event.simulate(r,e.target,k.event.fix(e))};k.event.special[r]={setup:function(){var e=this.ownerDocument||this,t=Q.access(e,r);t||e.addEventListener(n,i,!0),Q.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this,t=Q.access(e,r)-1;t?Q.access(e,r,t):(e.removeEventListener(n,i,!0),Q.remove(e,r))}}});var Et=C.location,kt=Date.now(),St=/\?/;k.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||k.error("Invalid XML: "+e),t};var Nt=/\[\]$/,At=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,jt=/^(?:input|select|textarea|keygen)/i;function qt(n,e,r,i){var t;if(Array.isArray(e))k.each(e,function(e,t){r||Nt.test(n)?i(n,t):qt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)qt(n+"["+t+"]",e[t],r,i)}k.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!k.isPlainObject(e))k.each(e,function(){i(this.name,this.value)});else for(n in e)qt(n,e[n],t,i);return r.join("&")},k.fn.extend({serialize:function(){return k.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=k.prop(this,"elements");return e?k.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!k(this).is(":disabled")&&jt.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=k(this).val();return null==n?null:Array.isArray(n)?k.map(n,function(e){return{name:t.name,value:e.replace(At,"\r\n")}}):{name:t.name,value:n.replace(At,"\r\n")}}).get()}});var Lt=/%20/g,Ht=/#.*$/,Ot=/([?&])_=[^&]*/,Pt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Rt=/^(?:GET|HEAD)$/,Mt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Ft=E.createElement("a");function Bt(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(R)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function _t(t,i,o,a){var s={},u=t===Wt;function l(e){var r;return s[e]=!0,k.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function zt(e,t){var n,r,i=k.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&k.extend(!0,e,r),e}Ft.href=Et.href,k.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":k.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,k.ajaxSettings),t):zt(k.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Wt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=k.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?k(y):k.event,x=k.Deferred(),b=k.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Pt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace(Mt,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(R)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Ft.protocol+"//"+Ft.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=k.param(v.data,v.traditional)),_t(It,v,t,T),h)return T;for(i in(g=k.event&&v.global)&&0==k.active++&&k.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Rt.test(v.type),f=v.url.replace(Ht,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Lt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(St.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Ot,"$1"),o=(St.test(f)?"&":"?")+"_="+kt+++o),v.url=f+o),v.ifModified&&(k.lastModified[f]&&T.setRequestHeader("If-Modified-Since",k.lastModified[f]),k.etag[f]&&T.setRequestHeader("If-None-Match",k.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+$t+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=_t(Wt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(k.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(k.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--k.active||k.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return k.get(e,t,n,"json")},getScript:function(e,t){return k.get(e,void 0,t,"script")}}),k.each(["get","post"],function(e,i){k[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),k.ajax(k.extend({url:e,type:i,dataType:r,data:t,success:n},k.isPlainObject(e)&&e))}}),k._evalUrl=function(e,t){return k.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){k.globalEval(e,t)}})},k.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=k(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){k(this).wrapInner(n.call(this,e))}):this.each(function(){var e=k(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){k(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){k(this).replaceWith(this.childNodes)}),this}}),k.expr.pseudos.hidden=function(e){return!k.expr.pseudos.visible(e)},k.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},k.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Xt=k.ajaxSettings.xhr();y.cors=!!Xt&&"withCredentials"in Xt,y.ajax=Xt=!!Xt,k.ajaxTransport(function(i){var o,a;if(y.cors||Xt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Ut[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),k.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),k.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return k.globalEval(e),e}}}),k.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),k.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=k("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=mt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&k.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?k("<div>").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}}),k.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),k.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),k.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||k.guid++,i},k.holdReady=function(e){e?k.readyWait++:k.ready(!0)},k.isArray=Array.isArray,k.parseJSON=JSON.parse,k.nodeName=A,k.isFunction=m,k.isWindow=x,k.camelCase=V,k.type=w,k.now=Date.now,k.isNumeric=function(e){var t=k.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return k});var Qt=C.jQuery,Jt=C.$;return k.noConflict=function(e){return C.$===k&&(C.$=Jt),e&&C.jQuery===k&&(C.jQuery=Qt),k},e||(C.jQuery=C.$=k),k});
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_444444_256x240.png b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_444444_256x240.png
deleted file mode 100644
index c2daae166..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_444444_256x240.png
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_555555_256x240.png b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_555555_256x240.png
deleted file mode 100644
index 47849283f..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_555555_256x240.png
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_777620_256x240.png b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_777620_256x240.png
deleted file mode 100644
index d2f58d255..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_777620_256x240.png
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_777777_256x240.png b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_777777_256x240.png
deleted file mode 100644
index 1d532588b..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_777777_256x240.png
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_cc0000_256x240.png b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_cc0000_256x240.png
deleted file mode 100644
index 2825f2004..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_cc0000_256x240.png
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_ffffff_256x240.png b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_ffffff_256x240.png
deleted file mode 100644
index 136a4f97b..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/images/ui-icons_ffffff_256x240.png
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/index.html b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/index.html
deleted file mode 100644
index 8429de14f..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/index.html
+++ /dev/null
@@ -1,565 +0,0 @@
-<!--
-  ! jQuery UI - v1.12.1 - 2016-09-14
-  http://jqueryui.com
-  Copyright jQuery Foundation and other contributors; Licensed MIT */
--->
-
-<!doctype html>
-<html lang="us">
-<head>
-	<meta charset="utf-8">
-	<title>jQuery UI Example Page</title>
-	<link href="jquery-ui.css" rel="stylesheet">
-	<style>
-	body{
-		font-family: "Trebuchet MS", sans-serif;
-		margin: 50px;
-	}
-	.demoHeaders {
-		margin-top: 2em;
-	}
-	#dialog-link {
-		padding: .4em 1em .4em 20px;
-		text-decoration: none;
-		position: relative;
-	}
-	#dialog-link span.ui-icon {
-		margin: 0 5px 0 0;
-		position: absolute;
-		left: .2em;
-		top: 50%;
-		margin-top: -8px;
-	}
-	#icons {
-		margin: 0;
-		padding: 0;
-	}
-	#icons li {
-		margin: 2px;
-		position: relative;
-		padding: 4px 0;
-		cursor: pointer;
-		float: left;
-		list-style: none;
-	}
-	#icons span.ui-icon {
-		float: left;
-		margin: 0 4px;
-	}
-	.fakewindowcontain .ui-widget-overlay {
-		position: absolute;
-	}
-	select {
-		width: 200px;
-	}
-	</style>
-</head>
-<body>
-
-<h1>Welcome to jQuery UI!</h1>
-
-<div class="ui-widget">
-	<p>This page demonstrates the widgets and theme you selected in Download Builder. Please make sure you are using them with a compatible jQuery version.</p>
-</div>
-
-<h1>YOUR COMPONENTS:</h1>
-
-
-<!-- Accordion -->
-<h2 class="demoHeaders">Accordion</h2>
-<div id="accordion">
-	<h3>First</h3>
-	<div>Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.</div>
-	<h3>Second</h3>
-	<div>Phasellus mattis tincidunt nibh.</div>
-	<h3>Third</h3>
-	<div>Nam dui erat, auctor a, dignissim quis.</div>
-</div>
-
-
-
-<!-- Autocomplete -->
-<h2 class="demoHeaders">Autocomplete</h2>
-<div>
-	<input id="autocomplete" title="type &quot;a&quot;">
-</div>
-
-
-
-<!-- Button -->
-<h2 class="demoHeaders">Button</h2>
-<button id="button">A button element</button>
-<button id="button-icon">An icon-only button</button>
-
-
-
-<!-- Checkboxradio -->
-<h2 class="demoHeaders">Checkboxradio</h2>
-<form style="margin-top: 1em;">
-	<div id="radioset">
-		<input type="radio" id="radio1" name="radio"><label for="radio1">Choice 1</label>
-		<input type="radio" id="radio2" name="radio" checked="checked"><label for="radio2">Choice 2</label>
-		<input type="radio" id="radio3" name="radio"><label for="radio3">Choice 3</label>
-	</div>
-</form>
-
-
-
-<!-- Controlgroup -->
-<h2 class="demoHeaders">Controlgroup</h2>
-<fieldset>
-	<legend>Rental Car</legend>
-	<div id="controlgroup">
-		<select id="car-type">
-			<option>Compact car</option>
-			<option>Midsize car</option>
-			<option>Full size car</option>
-			<option>SUV</option>
-			<option>Luxury</option>
-			<option>Truck</option>
-			<option>Van</option>
-		</select>
-		<label for="transmission-standard">Standard</label>
-		<input type="radio" name="transmission" id="transmission-standard">
-		<label for="transmission-automatic">Automatic</label>
-		<input type="radio" name="transmission" id="transmission-automatic">
-		<label for="insurance">Insurance</label>
-		<input type="checkbox" name="insurance" id="insurance">
-		<label for="horizontal-spinner" class="ui-controlgroup-label"># of cars</label>
-		<input id="horizontal-spinner" class="ui-spinner-input">
-		<button>Book Now!</button>
-	</div>
-</fieldset>
-
-
-
-<!-- Tabs -->
-<h2 class="demoHeaders">Tabs</h2>
-<div id="tabs">
-	<ul>
-		<li><a href="#tabs-1">First</a></li>
-		<li><a href="#tabs-2">Second</a></li>
-		<li><a href="#tabs-3">Third</a></li>
-	</ul>
-	<div id="tabs-1">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div>
-	<div id="tabs-2">Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.</div>
-	<div id="tabs-3">Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.</div>
-</div>
-
-
-
-<h2 class="demoHeaders">Dialog</h2>
-<p>
-	<button id="dialog-link" class="ui-button ui-corner-all ui-widget">
-		<span class="ui-icon ui-icon-newwin"></span>Open Dialog
-	</button>
-</p>
-
-<h2 class="demoHeaders">Overlay and Shadow Classes</h2>
-<div style="position: relative; width: 96%; height: 200px; padding:1% 2%; overflow:hidden;" class="fakewindowcontain">
-	<p>Lorem ipsum dolor sit amet,  Nulla nec tortor. Donec id elit quis purus consectetur consequat. </p><p>Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. </p><p>Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. </p><p>Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. </p><p>Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. </p><p>Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. </p>
-
-	<!-- ui-dialog -->
-	<div class="ui-widget-overlay ui-front"></div>
-	<div style="position: absolute; width: 320px; left: 50px; top: 30px; padding: 1.2em" class="ui-widget ui-front ui-widget-content ui-corner-all ui-widget-shadow">
-		Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-	</div>
-
-</div>
-
-<!-- ui-dialog -->
-<div id="dialog" title="Dialog Title">
-	<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
-</div>
-
-
-
-<h2 class="demoHeaders">Framework Icons (content color preview)</h2>
-<ul id="icons" class="ui-widget ui-helper-clearfix">
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-n"><span class="ui-icon ui-icon-caret-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-ne"><span class="ui-icon ui-icon-caret-1-ne"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-e"><span class="ui-icon ui-icon-caret-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-se"><span class="ui-icon ui-icon-caret-1-se"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-s"><span class="ui-icon ui-icon-caret-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-sw"><span class="ui-icon ui-icon-caret-1-sw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-w"><span class="ui-icon ui-icon-caret-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-nw"><span class="ui-icon ui-icon-caret-1-nw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-2-n-s"><span class="ui-icon ui-icon-caret-2-n-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-2-e-w"><span class="ui-icon ui-icon-caret-2-e-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-n"><span class="ui-icon ui-icon-triangle-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-ne"><span class="ui-icon ui-icon-triangle-1-ne"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-e"><span class="ui-icon ui-icon-triangle-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-se"><span class="ui-icon ui-icon-triangle-1-se"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-s"><span class="ui-icon ui-icon-triangle-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-sw"><span class="ui-icon ui-icon-triangle-1-sw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-w"><span class="ui-icon ui-icon-triangle-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-nw"><span class="ui-icon ui-icon-triangle-1-nw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-n-s"><span class="ui-icon ui-icon-triangle-2-n-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-e-w"><span class="ui-icon ui-icon-triangle-2-e-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-n"><span class="ui-icon ui-icon-arrow-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-ne"><span class="ui-icon ui-icon-arrow-1-ne"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-e"><span class="ui-icon ui-icon-arrow-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-se"><span class="ui-icon ui-icon-arrow-1-se"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-s"><span class="ui-icon ui-icon-arrow-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-sw"><span class="ui-icon ui-icon-arrow-1-sw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-w"><span class="ui-icon ui-icon-arrow-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-nw"><span class="ui-icon ui-icon-arrow-1-nw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-n-s"><span class="ui-icon ui-icon-arrow-2-n-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-ne-sw"><span class="ui-icon ui-icon-arrow-2-ne-sw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-e-w"><span class="ui-icon ui-icon-arrow-2-e-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-se-nw"><span class="ui-icon ui-icon-arrow-2-se-nw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-n"><span class="ui-icon ui-icon-arrowstop-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-e"><span class="ui-icon ui-icon-arrowstop-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-s"><span class="ui-icon ui-icon-arrowstop-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-w"><span class="ui-icon ui-icon-arrowstop-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-n"><span class="ui-icon ui-icon-arrowthick-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-ne"><span class="ui-icon ui-icon-arrowthick-1-ne"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-e"><span class="ui-icon ui-icon-arrowthick-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-se"><span class="ui-icon ui-icon-arrowthick-1-se"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-s"><span class="ui-icon ui-icon-arrowthick-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-sw"><span class="ui-icon ui-icon-arrowthick-1-sw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-w"><span class="ui-icon ui-icon-arrowthick-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-nw"><span class="ui-icon ui-icon-arrowthick-1-nw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-n-s"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-ne-sw"><span class="ui-icon ui-icon-arrowthick-2-ne-sw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-e-w"><span class="ui-icon ui-icon-arrowthick-2-e-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-se-nw"><span class="ui-icon ui-icon-arrowthick-2-se-nw"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-n"><span class="ui-icon ui-icon-arrowthickstop-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-e"><span class="ui-icon ui-icon-arrowthickstop-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-s"><span class="ui-icon ui-icon-arrowthickstop-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-w"><span class="ui-icon ui-icon-arrowthickstop-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-w"><span class="ui-icon ui-icon-arrowreturnthick-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-n"><span class="ui-icon ui-icon-arrowreturnthick-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-e"><span class="ui-icon ui-icon-arrowreturnthick-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-s"><span class="ui-icon ui-icon-arrowreturnthick-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-w"><span class="ui-icon ui-icon-arrowreturn-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-n"><span class="ui-icon ui-icon-arrowreturn-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-e"><span class="ui-icon ui-icon-arrowreturn-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-s"><span class="ui-icon ui-icon-arrowreturn-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-w"><span class="ui-icon ui-icon-arrowrefresh-1-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-n"><span class="ui-icon ui-icon-arrowrefresh-1-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-e"><span class="ui-icon ui-icon-arrowrefresh-1-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-s"><span class="ui-icon ui-icon-arrowrefresh-1-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-4"><span class="ui-icon ui-icon-arrow-4"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-4-diag"><span class="ui-icon ui-icon-arrow-4-diag"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-extlink"><span class="ui-icon ui-icon-extlink"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-newwin"><span class="ui-icon ui-icon-newwin"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-refresh"><span class="ui-icon ui-icon-refresh"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-shuffle"><span class="ui-icon ui-icon-shuffle"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-transfer-e-w"><span class="ui-icon ui-icon-transfer-e-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-transferthick-e-w"><span class="ui-icon ui-icon-transferthick-e-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-folder-collapsed"><span class="ui-icon ui-icon-folder-collapsed"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-folder-open"><span class="ui-icon ui-icon-folder-open"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-document"><span class="ui-icon ui-icon-document"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-document-b"><span class="ui-icon ui-icon-document-b"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-note"><span class="ui-icon ui-icon-note"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-mail-closed"><span class="ui-icon ui-icon-mail-closed"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-mail-open"><span class="ui-icon ui-icon-mail-open"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-suitcase"><span class="ui-icon ui-icon-suitcase"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-comment"><span class="ui-icon ui-icon-comment"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-person"><span class="ui-icon ui-icon-person"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-print"><span class="ui-icon ui-icon-print"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-trash"><span class="ui-icon ui-icon-trash"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-locked"><span class="ui-icon ui-icon-locked"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-unlocked"><span class="ui-icon ui-icon-unlocked"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-bookmark"><span class="ui-icon ui-icon-bookmark"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-tag"><span class="ui-icon ui-icon-tag"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-home"><span class="ui-icon ui-icon-home"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-flag"><span class="ui-icon ui-icon-flag"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-calculator"><span class="ui-icon ui-icon-calculator"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-cart"><span class="ui-icon ui-icon-cart"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-pencil"><span class="ui-icon ui-icon-pencil"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-clock"><span class="ui-icon ui-icon-clock"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-disk"><span class="ui-icon ui-icon-disk"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-calendar"><span class="ui-icon ui-icon-calendar"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-zoomin"><span class="ui-icon ui-icon-zoomin"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-zoomout"><span class="ui-icon ui-icon-zoomout"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-search"><span class="ui-icon ui-icon-search"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-wrench"><span class="ui-icon ui-icon-wrench"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-gear"><span class="ui-icon ui-icon-gear"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-heart"><span class="ui-icon ui-icon-heart"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-star"><span class="ui-icon ui-icon-star"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-link"><span class="ui-icon ui-icon-link"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-cancel"><span class="ui-icon ui-icon-cancel"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-plus"><span class="ui-icon ui-icon-plus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-plusthick"><span class="ui-icon ui-icon-plusthick"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-minus"><span class="ui-icon ui-icon-minus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-minusthick"><span class="ui-icon ui-icon-minusthick"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-close"><span class="ui-icon ui-icon-close"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-closethick"><span class="ui-icon ui-icon-closethick"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-key"><span class="ui-icon ui-icon-key"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-lightbulb"><span class="ui-icon ui-icon-lightbulb"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-scissors"><span class="ui-icon ui-icon-scissors"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-clipboard"><span class="ui-icon ui-icon-clipboard"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-copy"><span class="ui-icon ui-icon-copy"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-contact"><span class="ui-icon ui-icon-contact"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-image"><span class="ui-icon ui-icon-image"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-video"><span class="ui-icon ui-icon-video"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-script"><span class="ui-icon ui-icon-script"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-alert"><span class="ui-icon ui-icon-alert"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-info"><span class="ui-icon ui-icon-info"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-notice"><span class="ui-icon ui-icon-notice"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-help"><span class="ui-icon ui-icon-help"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-check"><span class="ui-icon ui-icon-check"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-bullet"><span class="ui-icon ui-icon-bullet"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-radio-off"><span class="ui-icon ui-icon-radio-off"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-radio-on"><span class="ui-icon ui-icon-radio-on"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-pin-w"><span class="ui-icon ui-icon-pin-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-pin-s"><span class="ui-icon ui-icon-pin-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-play"><span class="ui-icon ui-icon-play"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-pause"><span class="ui-icon ui-icon-pause"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-next"><span class="ui-icon ui-icon-seek-next"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-prev"><span class="ui-icon ui-icon-seek-prev"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-end"><span class="ui-icon ui-icon-seek-end"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-seek-first"><span class="ui-icon ui-icon-seek-first"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-stop"><span class="ui-icon ui-icon-stop"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-eject"><span class="ui-icon ui-icon-eject"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-volume-off"><span class="ui-icon ui-icon-volume-off"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-volume-on"><span class="ui-icon ui-icon-volume-on"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-power"><span class="ui-icon ui-icon-power"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-signal-diag"><span class="ui-icon ui-icon-signal-diag"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-signal"><span class="ui-icon ui-icon-signal"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-battery-0"><span class="ui-icon ui-icon-battery-0"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-battery-1"><span class="ui-icon ui-icon-battery-1"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-battery-2"><span class="ui-icon ui-icon-battery-2"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-battery-3"><span class="ui-icon ui-icon-battery-3"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-plus"><span class="ui-icon ui-icon-circle-plus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-minus"><span class="ui-icon ui-icon-circle-minus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-close"><span class="ui-icon ui-icon-circle-close"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-e"><span class="ui-icon ui-icon-circle-triangle-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-s"><span class="ui-icon ui-icon-circle-triangle-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-w"><span class="ui-icon ui-icon-circle-triangle-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-n"><span class="ui-icon ui-icon-circle-triangle-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-e"><span class="ui-icon ui-icon-circle-arrow-e"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-s"><span class="ui-icon ui-icon-circle-arrow-s"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-w"><span class="ui-icon ui-icon-circle-arrow-w"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-n"><span class="ui-icon ui-icon-circle-arrow-n"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomin"><span class="ui-icon ui-icon-circle-zoomin"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomout"><span class="ui-icon ui-icon-circle-zoomout"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circle-check"><span class="ui-icon ui-icon-circle-check"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-plus"><span class="ui-icon ui-icon-circlesmall-plus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-minus"><span class="ui-icon ui-icon-circlesmall-minus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-close"><span class="ui-icon ui-icon-circlesmall-close"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-plus"><span class="ui-icon ui-icon-squaresmall-plus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-minus"><span class="ui-icon ui-icon-squaresmall-minus"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-close"><span class="ui-icon ui-icon-squaresmall-close"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-dotted-vertical"><span class="ui-icon ui-icon-grip-dotted-vertical"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-dotted-horizontal"><span class="ui-icon ui-icon-grip-dotted-horizontal"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-vertical"><span class="ui-icon ui-icon-grip-solid-vertical"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-horizontal"><span class="ui-icon ui-icon-grip-solid-horizontal"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-gripsmall-diagonal-se"><span class="ui-icon ui-icon-gripsmall-diagonal-se"></span></li>
-	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-diagonal-se"><span class="ui-icon ui-icon-grip-diagonal-se"></span></li>
-</ul>
-
-
-<!-- Slider -->
-<h2 class="demoHeaders">Slider</h2>
-<div id="slider"></div>
-
-
-
-<!-- Datepicker -->
-<h2 class="demoHeaders">Datepicker</h2>
-<div id="datepicker"></div>
-
-
-
-<!-- Progressbar -->
-<h2 class="demoHeaders">Progressbar</h2>
-<div id="progressbar"></div>
-
-
-
-<!-- Progressbar -->
-<h2 class="demoHeaders">Selectmenu</h2>
-<select id="selectmenu">
-	<option>Slower</option>
-	<option>Slow</option>
-	<option selected="selected">Medium</option>
-	<option>Fast</option>
-	<option>Faster</option>
-</select>
-
-
-
-<!-- Spinner -->
-<h2 class="demoHeaders">Spinner</h2>
-<input id="spinner">
-
-
-
-<!-- Menu -->
-<h2 class="demoHeaders">Menu</h2>
-<ul style="width:100px;" id="menu">
-	<li><div>Item 1</div></li>
-	<li><div>Item 2</div></li>
-	<li><div>Item 3</div>
-		<ul>
-			<li><div>Item 3-1</div></li>
-			<li><div>Item 3-2</div></li>
-			<li><div>Item 3-3</div></li>
-			<li><div>Item 3-4</div></li>
-			<li><div>Item 3-5</div></li>
-		</ul>
-	</li>
-	<li><div>Item 4</div></li>
-	<li><div>Item 5</div></li>
-</ul>
-
-
-
-<!-- Tooltip -->
-<h2 class="demoHeaders">Tooltip</h2>
-<p id="tooltip">
-	<a href="#" title="That&apos;s what this widget is">Tooltips</a> can be attached to any element. When you hover
-the element with your mouse, the title attribute is displayed in a little box next to the element, just like a native tooltip.
-</p>
-
-
-<!-- Highlight / Error -->
-<h2 class="demoHeaders">Highlight / Error</h2>
-<div class="ui-widget">
-	<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px; padding: 0 .7em;">
-		<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
-		<strong>Hey!</strong> Sample ui-state-highlight style.</p>
-	</div>
-</div>
-<br>
-<div class="ui-widget">
-	<div class="ui-state-error ui-corner-all" style="padding: 0 .7em;">
-		<p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span>
-		<strong>Alert:</strong> Sample ui-state-error style.</p>
-	</div>
-</div>
-
-<script src="external/jquery/jquery.js"></script>
-<script src="jquery-ui.js"></script>
-<script>
-
-$( "#accordion" ).accordion();
-
-
-
-var availableTags = [
-	"ActionScript",
-	"AppleScript",
-	"Asp",
-	"BASIC",
-	"C",
-	"C++",
-	"Clojure",
-	"COBOL",
-	"ColdFusion",
-	"Erlang",
-	"Fortran",
-	"Groovy",
-	"Haskell",
-	"Java",
-	"JavaScript",
-	"Lisp",
-	"Perl",
-	"PHP",
-	"Python",
-	"Ruby",
-	"Scala",
-	"Scheme"
-];
-$( "#autocomplete" ).autocomplete({
-	source: availableTags
-});
-
-
-
-$( "#button" ).button();
-$( "#button-icon" ).button({
-	icon: "ui-icon-gear",
-	showLabel: false
-});
-
-
-
-$( "#radioset" ).buttonset();
-
-
-
-$( "#controlgroup" ).controlgroup();
-
-
-
-$( "#tabs" ).tabs();
-
-
-
-$( "#dialog" ).dialog({
-	autoOpen: false,
-	width: 400,
-	buttons: [
-		{
-			text: "Ok",
-			click: function() {
-				$( this ).dialog( "close" );
-			}
-		},
-		{
-			text: "Cancel",
-			click: function() {
-				$( this ).dialog( "close" );
-			}
-		}
-	]
-});
-
-// Link to open the dialog
-$( "#dialog-link" ).click(function( event ) {
-	$( "#dialog" ).dialog( "open" );
-	event.preventDefault();
-});
-
-
-
-$( "#datepicker" ).datepicker({
-	inline: true
-});
-
-
-
-$( "#slider" ).slider({
-	range: true,
-	values: [ 17, 67 ]
-});
-
-
-
-$( "#progressbar" ).progressbar({
-	value: 20
-});
-
-
-
-$( "#spinner" ).spinner();
-
-
-
-$( "#menu" ).menu();
-
-
-
-$( "#tooltip" ).tooltip();
-
-
-
-$( "#selectmenu" ).selectmenu();
-
-
-// Hover states on the static widgets
-$( "#dialog-link, #icons li" ).hover(
-	function() {
-		$( this ).addClass( "ui-state-hover" );
-	},
-	function() {
-		$( this ).removeClass( "ui-state-hover" );
-	}
-);
-</script>
-</body>
-</html>
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.css b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.css
deleted file mode 100644
index e73a29b3e..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.css
+++ /dev/null
@@ -1,1312 +0,0 @@
-/*! jQuery UI - v1.12.1 - 2016-09-14
-* http://jqueryui.com
-* Includes: core.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, draggable.css, resizable.css, progressbar.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?bgShadowXPos=&bgOverlayXPos=&bgErrorXPos=&bgHighlightXPos=&bgContentXPos=&bgHeaderXPos=&bgActiveXPos=&bgHoverXPos=&bgDefaultXPos=&bgShadowYPos=&bgOverlayYPos=&bgErrorYPos=&bgHighlightYPos=&bgContentYPos=&bgHeaderYPos=&bgActiveYPos=&bgHoverYPos=&bgDefaultYPos=&bgShadowRepeat=&bgOverlayRepeat=&bgErrorRepeat=&bgHighlightRepeat=&bgContentRepeat=&bgHeaderRepeat=&bgActiveRepeat=&bgHoverRepeat=&bgDefaultRepeat=&iconsHover=url(%22images%2Fui-icons_555555_256x240.png%22)&iconsHighlight=url(%22images%2Fui-icons_777620_256x240.png%22)&iconsHeader=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsError=url(%22images%2Fui-icons_cc0000_256x240.png%22)&iconsDefault=url(%22images%2Fui-icons_777777_256x240.png%22)&iconsContent=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsActive=url(%22images%2Fui-icons_ffffff_256x240.png%22)&bgImgUrlShadow=&bgImgUrlOverlay=&bgImgUrlHover=&bgImgUrlHighlight=&bgImgUrlHeader=&bgImgUrlError=&bgImgUrlDefault=&bgImgUrlContent=&bgImgUrlActive=&opacityFilterShadow=Alpha(Opacity%3D30)&opacityFilterOverlay=Alpha(Opacity%3D30)&opacityShadowPerc=30&opacityOverlayPerc=30&iconColorHover=%23555555&iconColorHighlight=%23777620&iconColorHeader=%23444444&iconColorError=%23cc0000&iconColorDefault=%23777777&iconColorContent=%23444444&iconColorActive=%23ffffff&bgImgOpacityShadow=0&bgImgOpacityOverlay=0&bgImgOpacityError=95&bgImgOpacityHighlight=55&bgImgOpacityContent=75&bgImgOpacityHeader=75&bgImgOpacityActive=65&bgImgOpacityHover=75&bgImgOpacityDefault=75&bgTextureShadow=flat&bgTextureOverlay=flat&bgTextureError=flat&bgTextureHighlight=flat&bgTextureContent=flat&bgTextureHeader=flat&bgTextureActive=flat&bgTextureHover=flat&bgTextureDefault=flat&cornerRadius=3px&fwDefault=normal&ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&cornerRadiusShadow=8px&thicknessShadow=5px&offsetLeftShadow=0px&offsetTopShadow=0px&opacityShadow=.3&bgColorShadow=%23666666&opacityOverlay=.3&bgColorOverlay=%23aaaaaa&fcError=%235f3f3f&borderColorError=%23f1a899&bgColorError=%23fddfdf&fcHighlight=%23777620&borderColorHighlight=%23dad55e&bgColorHighlight=%23fffa90&fcContent=%23333333&borderColorContent=%23dddddd&bgColorContent=%23ffffff&fcHeader=%23333333&borderColorHeader=%23dddddd&bgColorHeader=%23e9e9e9&fcActive=%23ffffff&borderColorActive=%23003eff&bgColorActive=%23007fff&fcHover=%232b2b2b&borderColorHover=%23cccccc&bgColorHover=%23ededed&fcDefault=%23454545&borderColorDefault=%23c5c5c5&bgColorDefault=%23f6f6f6
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden {
-	display: none;
-}
-.ui-helper-hidden-accessible {
-	border: 0;
-	clip: rect(0 0 0 0);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	width: 1px;
-}
-.ui-helper-reset {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	line-height: 1.3;
-	text-decoration: none;
-	font-size: 100%;
-	list-style: none;
-}
-.ui-helper-clearfix:before,
-.ui-helper-clearfix:after {
-	content: "";
-	display: table;
-	border-collapse: collapse;
-}
-.ui-helper-clearfix:after {
-	clear: both;
-}
-.ui-helper-zfix {
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	position: absolute;
-	opacity: 0;
-	filter:Alpha(Opacity=0); /* support: IE8 */
-}
-
-.ui-front {
-	z-index: 100;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled {
-	cursor: default !important;
-	pointer-events: none;
-}
-
-
-/* Icons
-----------------------------------*/
-.ui-icon {
-	display: inline-block;
-	vertical-align: middle;
-	margin-top: -.25em;
-	position: relative;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-}
-
-.ui-widget-icon-block {
-	left: 50%;
-	margin-left: -8px;
-	display: block;
-}
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-.ui-accordion .ui-accordion-header {
-	display: block;
-	cursor: pointer;
-	position: relative;
-	margin: 2px 0 0 0;
-	padding: .5em .5em .5em .7em;
-	font-size: 100%;
-}
-.ui-accordion .ui-accordion-content {
-	padding: 1em 2.2em;
-	border-top: 0;
-	overflow: auto;
-}
-.ui-autocomplete {
-	position: absolute;
-	top: 0;
-	left: 0;
-	cursor: default;
-}
-.ui-menu {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-	display: block;
-	outline: 0;
-}
-.ui-menu .ui-menu {
-	position: absolute;
-}
-.ui-menu .ui-menu-item {
-	margin: 0;
-	cursor: pointer;
-	/* support: IE10, see #8844 */
-	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
-}
-.ui-menu .ui-menu-item-wrapper {
-	position: relative;
-	padding: 3px 1em 3px .4em;
-}
-.ui-menu .ui-menu-divider {
-	margin: 5px 0;
-	height: 0;
-	font-size: 0;
-	line-height: 0;
-	border-width: 1px 0 0 0;
-}
-.ui-menu .ui-state-focus,
-.ui-menu .ui-state-active {
-	margin: -1px;
-}
-
-/* icon support */
-.ui-menu-icons {
-	position: relative;
-}
-.ui-menu-icons .ui-menu-item-wrapper {
-	padding-left: 2em;
-}
-
-/* left-aligned */
-.ui-menu .ui-icon {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: .2em;
-	margin: auto 0;
-}
-
-/* right-aligned */
-.ui-menu .ui-menu-icon {
-	left: auto;
-	right: 0;
-}
-.ui-button {
-	padding: .4em 1em;
-	display: inline-block;
-	position: relative;
-	line-height: normal;
-	margin-right: .1em;
-	cursor: pointer;
-	vertical-align: middle;
-	text-align: center;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-
-	/* Support: IE <= 11 */
-	overflow: visible;
-}
-
-.ui-button,
-.ui-button:link,
-.ui-button:visited,
-.ui-button:hover,
-.ui-button:active {
-	text-decoration: none;
-}
-
-/* to make room for the icon, a width needs to be set here */
-.ui-button-icon-only {
-	width: 2em;
-	box-sizing: border-box;
-	text-indent: -9999px;
-	white-space: nowrap;
-}
-
-/* no icon support for input elements */
-input.ui-button.ui-button-icon-only {
-	text-indent: 0;
-}
-
-/* button icon element(s) */
-.ui-button-icon-only .ui-icon {
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	margin-top: -8px;
-	margin-left: -8px;
-}
-
-.ui-button.ui-icon-notext .ui-icon {
-	padding: 0;
-	width: 2.1em;
-	height: 2.1em;
-	text-indent: -9999px;
-	white-space: nowrap;
-
-}
-
-input.ui-button.ui-icon-notext .ui-icon {
-	width: auto;
-	height: auto;
-	text-indent: 0;
-	white-space: normal;
-	padding: .4em 1em;
-}
-
-/* workarounds */
-/* Support: Firefox 5 - 40 */
-input.ui-button::-moz-focus-inner,
-button.ui-button::-moz-focus-inner {
-	border: 0;
-	padding: 0;
-}
-.ui-controlgroup {
-	vertical-align: middle;
-	display: inline-block;
-}
-.ui-controlgroup > .ui-controlgroup-item {
-	float: left;
-	margin-left: 0;
-	margin-right: 0;
-}
-.ui-controlgroup > .ui-controlgroup-item:focus,
-.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus {
-	z-index: 9999;
-}
-.ui-controlgroup-vertical > .ui-controlgroup-item {
-	display: block;
-	float: none;
-	width: 100%;
-	margin-top: 0;
-	margin-bottom: 0;
-	text-align: left;
-}
-.ui-controlgroup-vertical .ui-controlgroup-item {
-	box-sizing: border-box;
-}
-.ui-controlgroup .ui-controlgroup-label {
-	padding: .4em 1em;
-}
-.ui-controlgroup .ui-controlgroup-label span {
-	font-size: 80%;
-}
-.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item {
-	border-left: none;
-}
-.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item {
-	border-top: none;
-}
-.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content {
-	border-right: none;
-}
-.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content {
-	border-bottom: none;
-}
-
-/* Spinner specific style fixes */
-.ui-controlgroup-vertical .ui-spinner-input {
-
-	/* Support: IE8 only, Android < 4.4 only */
-	width: 75%;
-	width: calc( 100% - 2.4em );
-}
-.ui-controlgroup-vertical .ui-spinner .ui-spinner-up {
-	border-top-style: solid;
-}
-
-.ui-checkboxradio-label .ui-icon-background {
-	box-shadow: inset 1px 1px 1px #ccc;
-	border-radius: .12em;
-	border: none;
-}
-.ui-checkboxradio-radio-label .ui-icon-background {
-	width: 16px;
-	height: 16px;
-	border-radius: 1em;
-	overflow: visible;
-	border: none;
-}
-.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,
-.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon {
-	background-image: none;
-	width: 8px;
-	height: 8px;
-	border-width: 4px;
-	border-style: solid;
-}
-.ui-checkboxradio-disabled {
-	pointer-events: none;
-}
-.ui-datepicker {
-	width: 17em;
-	padding: .2em .2em 0;
-	display: none;
-}
-.ui-datepicker .ui-datepicker-header {
-	position: relative;
-	padding: .2em 0;
-}
-.ui-datepicker .ui-datepicker-prev,
-.ui-datepicker .ui-datepicker-next {
-	position: absolute;
-	top: 2px;
-	width: 1.8em;
-	height: 1.8em;
-}
-.ui-datepicker .ui-datepicker-prev-hover,
-.ui-datepicker .ui-datepicker-next-hover {
-	top: 1px;
-}
-.ui-datepicker .ui-datepicker-prev {
-	left: 2px;
-}
-.ui-datepicker .ui-datepicker-next {
-	right: 2px;
-}
-.ui-datepicker .ui-datepicker-prev-hover {
-	left: 1px;
-}
-.ui-datepicker .ui-datepicker-next-hover {
-	right: 1px;
-}
-.ui-datepicker .ui-datepicker-prev span,
-.ui-datepicker .ui-datepicker-next span {
-	display: block;
-	position: absolute;
-	left: 50%;
-	margin-left: -8px;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-datepicker .ui-datepicker-title {
-	margin: 0 2.3em;
-	line-height: 1.8em;
-	text-align: center;
-}
-.ui-datepicker .ui-datepicker-title select {
-	font-size: 1em;
-	margin: 1px 0;
-}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year {
-	width: 45%;
-}
-.ui-datepicker table {
-	width: 100%;
-	font-size: .9em;
-	border-collapse: collapse;
-	margin: 0 0 .4em;
-}
-.ui-datepicker th {
-	padding: .7em .3em;
-	text-align: center;
-	font-weight: bold;
-	border: 0;
-}
-.ui-datepicker td {
-	border: 0;
-	padding: 1px;
-}
-.ui-datepicker td span,
-.ui-datepicker td a {
-	display: block;
-	padding: .2em;
-	text-align: right;
-	text-decoration: none;
-}
-.ui-datepicker .ui-datepicker-buttonpane {
-	background-image: none;
-	margin: .7em 0 0 0;
-	padding: 0 .2em;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 0;
-}
-.ui-datepicker .ui-datepicker-buttonpane button {
-	float: right;
-	margin: .5em .2em .4em;
-	cursor: pointer;
-	padding: .2em .6em .3em .6em;
-	width: auto;
-	overflow: visible;
-}
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
-	float: left;
-}
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi {
-	width: auto;
-}
-.ui-datepicker-multi .ui-datepicker-group {
-	float: left;
-}
-.ui-datepicker-multi .ui-datepicker-group table {
-	width: 95%;
-	margin: 0 auto .4em;
-}
-.ui-datepicker-multi-2 .ui-datepicker-group {
-	width: 50%;
-}
-.ui-datepicker-multi-3 .ui-datepicker-group {
-	width: 33.3%;
-}
-.ui-datepicker-multi-4 .ui-datepicker-group {
-	width: 25%;
-}
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
-	border-left-width: 0;
-}
-.ui-datepicker-multi .ui-datepicker-buttonpane {
-	clear: left;
-}
-.ui-datepicker-row-break {
-	clear: both;
-	width: 100%;
-	font-size: 0;
-}
-
-/* RTL support */
-.ui-datepicker-rtl {
-	direction: rtl;
-}
-.ui-datepicker-rtl .ui-datepicker-prev {
-	right: 2px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next {
-	left: 2px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-prev:hover {
-	right: 1px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next:hover {
-	left: 1px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane {
-	clear: right;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button {
-	float: left;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
-.ui-datepicker-rtl .ui-datepicker-group {
-	float: right;
-}
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
-	border-right-width: 0;
-	border-left-width: 1px;
-}
-
-/* Icons */
-.ui-datepicker .ui-icon {
-	display: block;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-	left: .5em;
-	top: .3em;
-}
-.ui-dialog {
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: .2em;
-	outline: 0;
-}
-.ui-dialog .ui-dialog-titlebar {
-	padding: .4em 1em;
-	position: relative;
-}
-.ui-dialog .ui-dialog-title {
-	float: left;
-	margin: .1em 0;
-	white-space: nowrap;
-	width: 90%;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.ui-dialog .ui-dialog-titlebar-close {
-	position: absolute;
-	right: .3em;
-	top: 50%;
-	width: 20px;
-	margin: -10px 0 0 0;
-	padding: 1px;
-	height: 20px;
-}
-.ui-dialog .ui-dialog-content {
-	position: relative;
-	border: 0;
-	padding: .5em 1em;
-	background: none;
-	overflow: auto;
-}
-.ui-dialog .ui-dialog-buttonpane {
-	text-align: left;
-	border-width: 1px 0 0 0;
-	background-image: none;
-	margin-top: .5em;
-	padding: .3em 1em .5em .4em;
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: right;
-}
-.ui-dialog .ui-dialog-buttonpane button {
-	margin: .5em .4em .5em 0;
-	cursor: pointer;
-}
-.ui-dialog .ui-resizable-n {
-	height: 2px;
-	top: 0;
-}
-.ui-dialog .ui-resizable-e {
-	width: 2px;
-	right: 0;
-}
-.ui-dialog .ui-resizable-s {
-	height: 2px;
-	bottom: 0;
-}
-.ui-dialog .ui-resizable-w {
-	width: 2px;
-	left: 0;
-}
-.ui-dialog .ui-resizable-se,
-.ui-dialog .ui-resizable-sw,
-.ui-dialog .ui-resizable-ne,
-.ui-dialog .ui-resizable-nw {
-	width: 7px;
-	height: 7px;
-}
-.ui-dialog .ui-resizable-se {
-	right: 0;
-	bottom: 0;
-}
-.ui-dialog .ui-resizable-sw {
-	left: 0;
-	bottom: 0;
-}
-.ui-dialog .ui-resizable-ne {
-	right: 0;
-	top: 0;
-}
-.ui-dialog .ui-resizable-nw {
-	left: 0;
-	top: 0;
-}
-.ui-draggable .ui-dialog-titlebar {
-	cursor: move;
-}
-.ui-draggable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-resizable {
-	position: relative;
-}
-.ui-resizable-handle {
-	position: absolute;
-	font-size: 0.1px;
-	display: block;
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-resizable-disabled .ui-resizable-handle,
-.ui-resizable-autohide .ui-resizable-handle {
-	display: none;
-}
-.ui-resizable-n {
-	cursor: n-resize;
-	height: 7px;
-	width: 100%;
-	top: -5px;
-	left: 0;
-}
-.ui-resizable-s {
-	cursor: s-resize;
-	height: 7px;
-	width: 100%;
-	bottom: -5px;
-	left: 0;
-}
-.ui-resizable-e {
-	cursor: e-resize;
-	width: 7px;
-	right: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-w {
-	cursor: w-resize;
-	width: 7px;
-	left: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-se {
-	cursor: se-resize;
-	width: 12px;
-	height: 12px;
-	right: 1px;
-	bottom: 1px;
-}
-.ui-resizable-sw {
-	cursor: sw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	bottom: -5px;
-}
-.ui-resizable-nw {
-	cursor: nw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	top: -5px;
-}
-.ui-resizable-ne {
-	cursor: ne-resize;
-	width: 9px;
-	height: 9px;
-	right: -5px;
-	top: -5px;
-}
-.ui-progressbar {
-	height: 2em;
-	text-align: left;
-	overflow: hidden;
-}
-.ui-progressbar .ui-progressbar-value {
-	margin: -1px;
-	height: 100%;
-}
-.ui-progressbar .ui-progressbar-overlay {
-	background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
-	height: 100%;
-	filter: alpha(opacity=25); /* support: IE8 */
-	opacity: 0.25;
-}
-.ui-progressbar-indeterminate .ui-progressbar-value {
-	background-image: none;
-}
-.ui-selectable {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-selectable-helper {
-	position: absolute;
-	z-index: 100;
-	border: 1px dotted black;
-}
-.ui-selectmenu-menu {
-	padding: 0;
-	margin: 0;
-	position: absolute;
-	top: 0;
-	left: 0;
-	display: none;
-}
-.ui-selectmenu-menu .ui-menu {
-	overflow: auto;
-	overflow-x: hidden;
-	padding-bottom: 1px;
-}
-.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup {
-	font-size: 1em;
-	font-weight: bold;
-	line-height: 1.5;
-	padding: 2px 0.4em;
-	margin: 0.5em 0 0 0;
-	height: auto;
-	border: 0;
-}
-.ui-selectmenu-open {
-	display: block;
-}
-.ui-selectmenu-text {
-	display: block;
-	margin-right: 20px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.ui-selectmenu-button.ui-button {
-	text-align: left;
-	white-space: nowrap;
-	width: 14em;
-}
-.ui-selectmenu-icon.ui-icon {
-	float: right;
-	margin-top: 0;
-}
-.ui-slider {
-	position: relative;
-	text-align: left;
-}
-.ui-slider .ui-slider-handle {
-	position: absolute;
-	z-index: 2;
-	width: 1.2em;
-	height: 1.2em;
-	cursor: default;
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-slider .ui-slider-range {
-	position: absolute;
-	z-index: 1;
-	font-size: .7em;
-	display: block;
-	border: 0;
-	background-position: 0 0;
-}
-
-/* support: IE8 - See #6727 */
-.ui-slider.ui-state-disabled .ui-slider-handle,
-.ui-slider.ui-state-disabled .ui-slider-range {
-	filter: inherit;
-}
-
-.ui-slider-horizontal {
-	height: .8em;
-}
-.ui-slider-horizontal .ui-slider-handle {
-	top: -.3em;
-	margin-left: -.6em;
-}
-.ui-slider-horizontal .ui-slider-range {
-	top: 0;
-	height: 100%;
-}
-.ui-slider-horizontal .ui-slider-range-min {
-	left: 0;
-}
-.ui-slider-horizontal .ui-slider-range-max {
-	right: 0;
-}
-
-.ui-slider-vertical {
-	width: .8em;
-	height: 100px;
-}
-.ui-slider-vertical .ui-slider-handle {
-	left: -.3em;
-	margin-left: 0;
-	margin-bottom: -.6em;
-}
-.ui-slider-vertical .ui-slider-range {
-	left: 0;
-	width: 100%;
-}
-.ui-slider-vertical .ui-slider-range-min {
-	bottom: 0;
-}
-.ui-slider-vertical .ui-slider-range-max {
-	top: 0;
-}
-.ui-sortable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-spinner {
-	position: relative;
-	display: inline-block;
-	overflow: hidden;
-	padding: 0;
-	vertical-align: middle;
-}
-.ui-spinner-input {
-	border: none;
-	background: none;
-	color: inherit;
-	padding: .222em 0;
-	margin: .2em 0;
-	vertical-align: middle;
-	margin-left: .4em;
-	margin-right: 2em;
-}
-.ui-spinner-button {
-	width: 1.6em;
-	height: 50%;
-	font-size: .5em;
-	padding: 0;
-	margin: 0;
-	text-align: center;
-	position: absolute;
-	cursor: default;
-	display: block;
-	overflow: hidden;
-	right: 0;
-}
-/* more specificity required here to override default borders */
-.ui-spinner a.ui-spinner-button {
-	border-top-style: none;
-	border-bottom-style: none;
-	border-right-style: none;
-}
-.ui-spinner-up {
-	top: 0;
-}
-.ui-spinner-down {
-	bottom: 0;
-}
-.ui-tabs {
-	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-	padding: .2em;
-}
-.ui-tabs .ui-tabs-nav {
-	margin: 0;
-	padding: .2em .2em 0;
-}
-.ui-tabs .ui-tabs-nav li {
-	list-style: none;
-	float: left;
-	position: relative;
-	top: 0;
-	margin: 1px .2em 0 0;
-	border-bottom-width: 0;
-	padding: 0;
-	white-space: nowrap;
-}
-.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
-	float: left;
-	padding: .5em 1em;
-	text-decoration: none;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active {
-	margin-bottom: -1px;
-	padding-bottom: 1px;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
-	cursor: default;
-}
-.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
-	cursor: pointer;
-}
-.ui-tabs .ui-tabs-panel {
-	display: block;
-	border-width: 0;
-	padding: 1em 1.4em;
-	background: none;
-}
-.ui-tooltip {
-	padding: 8px;
-	position: absolute;
-	z-index: 9999;
-	max-width: 300px;
-}
-body .ui-tooltip {
-	border-width: 2px;
-}
-
-/* Component containers
-----------------------------------*/
-.ui-widget {
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 1em;
-}
-.ui-widget .ui-widget {
-	font-size: 1em;
-}
-.ui-widget input,
-.ui-widget select,
-.ui-widget textarea,
-.ui-widget button {
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 1em;
-}
-.ui-widget.ui-widget-content {
-	border: 1px solid #c5c5c5;
-}
-.ui-widget-content {
-	border: 1px solid #dddddd;
-	background: #ffffff;
-	color: #333333;
-}
-.ui-widget-content a {
-	color: #333333;
-}
-.ui-widget-header {
-	border: 1px solid #dddddd;
-	background: #e9e9e9;
-	color: #333333;
-	font-weight: bold;
-}
-.ui-widget-header a {
-	color: #333333;
-}
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default,
-.ui-widget-content .ui-state-default,
-.ui-widget-header .ui-state-default,
-.ui-button,
-
-/* We use html here because we need a greater specificity to make sure disabled
-works properly when clicked or hovered */
-html .ui-button.ui-state-disabled:hover,
-html .ui-button.ui-state-disabled:active {
-	border: 1px solid #c5c5c5;
-	background: #f6f6f6;
-	font-weight: normal;
-	color: #454545;
-}
-.ui-state-default a,
-.ui-state-default a:link,
-.ui-state-default a:visited,
-a.ui-button,
-a:link.ui-button,
-a:visited.ui-button,
-.ui-button {
-	color: #454545;
-	text-decoration: none;
-}
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus,
-.ui-button:hover,
-.ui-button:focus {
-	border: 1px solid #cccccc;
-	background: #ededed;
-	font-weight: normal;
-	color: #2b2b2b;
-}
-.ui-state-hover a,
-.ui-state-hover a:hover,
-.ui-state-hover a:link,
-.ui-state-hover a:visited,
-.ui-state-focus a,
-.ui-state-focus a:hover,
-.ui-state-focus a:link,
-.ui-state-focus a:visited,
-a.ui-button:hover,
-a.ui-button:focus {
-	color: #2b2b2b;
-	text-decoration: none;
-}
-
-.ui-visual-focus {
-	box-shadow: 0 0 3px 1px rgb(94, 158, 214);
-}
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active,
-a.ui-button:active,
-.ui-button:active,
-.ui-button.ui-state-active:hover {
-	border: 1px solid #003eff;
-	background: #007fff;
-	font-weight: normal;
-	color: #ffffff;
-}
-.ui-icon-background,
-.ui-state-active .ui-icon-background {
-	border: #003eff;
-	background-color: #ffffff;
-}
-.ui-state-active a,
-.ui-state-active a:link,
-.ui-state-active a:visited {
-	color: #ffffff;
-	text-decoration: none;
-}
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight,
-.ui-widget-content .ui-state-highlight,
-.ui-widget-header .ui-state-highlight {
-	border: 1px solid #dad55e;
-	background: #fffa90;
-	color: #777620;
-}
-.ui-state-checked {
-	border: 1px solid #dad55e;
-	background: #fffa90;
-}
-.ui-state-highlight a,
-.ui-widget-content .ui-state-highlight a,
-.ui-widget-header .ui-state-highlight a {
-	color: #777620;
-}
-.ui-state-error,
-.ui-widget-content .ui-state-error,
-.ui-widget-header .ui-state-error {
-	border: 1px solid #f1a899;
-	background: #fddfdf;
-	color: #5f3f3f;
-}
-.ui-state-error a,
-.ui-widget-content .ui-state-error a,
-.ui-widget-header .ui-state-error a {
-	color: #5f3f3f;
-}
-.ui-state-error-text,
-.ui-widget-content .ui-state-error-text,
-.ui-widget-header .ui-state-error-text {
-	color: #5f3f3f;
-}
-.ui-priority-primary,
-.ui-widget-content .ui-priority-primary,
-.ui-widget-header .ui-priority-primary {
-	font-weight: bold;
-}
-.ui-priority-secondary,
-.ui-widget-content .ui-priority-secondary,
-.ui-widget-header .ui-priority-secondary {
-	opacity: .7;
-	filter:Alpha(Opacity=70); /* support: IE8 */
-	font-weight: normal;
-}
-.ui-state-disabled,
-.ui-widget-content .ui-state-disabled,
-.ui-widget-header .ui-state-disabled {
-	opacity: .35;
-	filter:Alpha(Opacity=35); /* support: IE8 */
-	background-image: none;
-}
-.ui-state-disabled .ui-icon {
-	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
-}
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	width: 16px;
-	height: 16px;
-}
-.ui-icon,
-.ui-widget-content .ui-icon {
-	background-image: url("images/ui-icons_444444_256x240.png");
-}
-.ui-widget-header .ui-icon {
-	background-image: url("images/ui-icons_444444_256x240.png");
-}
-.ui-state-hover .ui-icon,
-.ui-state-focus .ui-icon,
-.ui-button:hover .ui-icon,
-.ui-button:focus .ui-icon {
-	background-image: url("images/ui-icons_555555_256x240.png");
-}
-.ui-state-active .ui-icon,
-.ui-button:active .ui-icon {
-	background-image: url("images/ui-icons_ffffff_256x240.png");
-}
-.ui-state-highlight .ui-icon,
-.ui-button .ui-state-highlight.ui-icon {
-	background-image: url("images/ui-icons_777620_256x240.png");
-}
-.ui-state-error .ui-icon,
-.ui-state-error-text .ui-icon {
-	background-image: url("images/ui-icons_cc0000_256x240.png");
-}
-.ui-button .ui-icon {
-	background-image: url("images/ui-icons_777777_256x240.png");
-}
-
-/* positioning */
-.ui-icon-blank { background-position: 16px 16px; }
-.ui-icon-caret-1-n { background-position: 0 0; }
-.ui-icon-caret-1-ne { background-position: -16px 0; }
-.ui-icon-caret-1-e { background-position: -32px 0; }
-.ui-icon-caret-1-se { background-position: -48px 0; }
-.ui-icon-caret-1-s { background-position: -65px 0; }
-.ui-icon-caret-1-sw { background-position: -80px 0; }
-.ui-icon-caret-1-w { background-position: -96px 0; }
-.ui-icon-caret-1-nw { background-position: -112px 0; }
-.ui-icon-caret-2-n-s { background-position: -128px 0; }
-.ui-icon-caret-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -65px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -65px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 1px -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-left,
-.ui-corner-tl {
-	border-top-left-radius: 3px;
-}
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-right,
-.ui-corner-tr {
-	border-top-right-radius: 3px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-left,
-.ui-corner-bl {
-	border-bottom-left-radius: 3px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-right,
-.ui-corner-br {
-	border-bottom-right-radius: 3px;
-}
-
-/* Overlays */
-.ui-widget-overlay {
-	background: #aaaaaa;
-	opacity: .003;
-	filter: Alpha(Opacity=.3); /* support: IE8 */
-}
-.ui-widget-shadow {
-	-webkit-box-shadow: 0px 0px 5px #666666;
-	box-shadow: 0px 0px 5px #666666;
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.js b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.js
deleted file mode 100644
index 021355237..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.js
+++ /dev/null
@@ -1,18706 +0,0 @@
-/*! jQuery UI - v1.12.1 - 2016-09-14
-* http://jqueryui.com
-* Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([ "jquery" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-
-$.ui = $.ui || {};
-
-var version = $.ui.version = "1.12.1";
-
-
-/*!
- * jQuery UI Widget 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Widget
-//>>group: Core
-//>>description: Provides a factory for creating stateful widgets with a common API.
-//>>docs: http://api.jqueryui.com/jQuery.widget/
-//>>demos: http://jqueryui.com/widget/
-
-
-
-var widgetUuid = 0;
-var widgetSlice = Array.prototype.slice;
-
-$.cleanData = ( function( orig ) {
-	return function( elems ) {
-		var events, elem, i;
-		for ( i = 0; ( elem = elems[ i ] ) != null; i++ ) {
-			try {
-
-				// Only trigger remove when necessary to save time
-				events = $._data( elem, "events" );
-				if ( events && events.remove ) {
-					$( elem ).triggerHandler( "remove" );
-				}
-
-			// Http://bugs.jquery.com/ticket/8235
-			} catch ( e ) {}
-		}
-		orig( elems );
-	};
-} )( $.cleanData );
-
-$.widget = function( name, base, prototype ) {
-	var existingConstructor, constructor, basePrototype;
-
-	// ProxiedPrototype allows the provided prototype to remain unmodified
-	// so that it can be used as a mixin for multiple widgets (#8876)
-	var proxiedPrototype = {};
-
-	var namespace = name.split( "." )[ 0 ];
-	name = name.split( "." )[ 1 ];
-	var fullName = namespace + "-" + name;
-
-	if ( !prototype ) {
-		prototype = base;
-		base = $.Widget;
-	}
-
-	if ( $.isArray( prototype ) ) {
-		prototype = $.extend.apply( null, [ {} ].concat( prototype ) );
-	}
-
-	// Create selector for plugin
-	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
-		return !!$.data( elem, fullName );
-	};
-
-	$[ namespace ] = $[ namespace ] || {};
-	existingConstructor = $[ namespace ][ name ];
-	constructor = $[ namespace ][ name ] = function( options, element ) {
-
-		// Allow instantiation without "new" keyword
-		if ( !this._createWidget ) {
-			return new constructor( options, element );
-		}
-
-		// Allow instantiation without initializing for simple inheritance
-		// must use "new" keyword (the code above always passes args)
-		if ( arguments.length ) {
-			this._createWidget( options, element );
-		}
-	};
-
-	// Extend with the existing constructor to carry over any static properties
-	$.extend( constructor, existingConstructor, {
-		version: prototype.version,
-
-		// Copy the object used to create the prototype in case we need to
-		// redefine the widget later
-		_proto: $.extend( {}, prototype ),
-
-		// Track widgets that inherit from this widget in case this widget is
-		// redefined after a widget inherits from it
-		_childConstructors: []
-	} );
-
-	basePrototype = new base();
-
-	// We need to make the options hash a property directly on the new instance
-	// otherwise we'll modify the options hash on the prototype that we're
-	// inheriting from
-	basePrototype.options = $.widget.extend( {}, basePrototype.options );
-	$.each( prototype, function( prop, value ) {
-		if ( !$.isFunction( value ) ) {
-			proxiedPrototype[ prop ] = value;
-			return;
-		}
-		proxiedPrototype[ prop ] = ( function() {
-			function _super() {
-				return base.prototype[ prop ].apply( this, arguments );
-			}
-
-			function _superApply( args ) {
-				return base.prototype[ prop ].apply( this, args );
-			}
-
-			return function() {
-				var __super = this._super;
-				var __superApply = this._superApply;
-				var returnValue;
-
-				this._super = _super;
-				this._superApply = _superApply;
-
-				returnValue = value.apply( this, arguments );
-
-				this._super = __super;
-				this._superApply = __superApply;
-
-				return returnValue;
-			};
-		} )();
-	} );
-	constructor.prototype = $.widget.extend( basePrototype, {
-
-		// TODO: remove support for widgetEventPrefix
-		// always use the name + a colon as the prefix, e.g., draggable:start
-		// don't prefix for widgets that aren't DOM-based
-		widgetEventPrefix: existingConstructor ? ( basePrototype.widgetEventPrefix || name ) : name
-	}, proxiedPrototype, {
-		constructor: constructor,
-		namespace: namespace,
-		widgetName: name,
-		widgetFullName: fullName
-	} );
-
-	// If this widget is being redefined then we need to find all widgets that
-	// are inheriting from it and redefine all of them so that they inherit from
-	// the new version of this widget. We're essentially trying to replace one
-	// level in the prototype chain.
-	if ( existingConstructor ) {
-		$.each( existingConstructor._childConstructors, function( i, child ) {
-			var childPrototype = child.prototype;
-
-			// Redefine the child widget using the same prototype that was
-			// originally used, but inherit from the new version of the base
-			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor,
-				child._proto );
-		} );
-
-		// Remove the list of existing child constructors from the old constructor
-		// so the old child constructors can be garbage collected
-		delete existingConstructor._childConstructors;
-	} else {
-		base._childConstructors.push( constructor );
-	}
-
-	$.widget.bridge( name, constructor );
-
-	return constructor;
-};
-
-$.widget.extend = function( target ) {
-	var input = widgetSlice.call( arguments, 1 );
-	var inputIndex = 0;
-	var inputLength = input.length;
-	var key;
-	var value;
-
-	for ( ; inputIndex < inputLength; inputIndex++ ) {
-		for ( key in input[ inputIndex ] ) {
-			value = input[ inputIndex ][ key ];
-			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
-
-				// Clone objects
-				if ( $.isPlainObject( value ) ) {
-					target[ key ] = $.isPlainObject( target[ key ] ) ?
-						$.widget.extend( {}, target[ key ], value ) :
-
-						// Don't extend strings, arrays, etc. with objects
-						$.widget.extend( {}, value );
-
-				// Copy everything else by reference
-				} else {
-					target[ key ] = value;
-				}
-			}
-		}
-	}
-	return target;
-};
-
-$.widget.bridge = function( name, object ) {
-	var fullName = object.prototype.widgetFullName || name;
-	$.fn[ name ] = function( options ) {
-		var isMethodCall = typeof options === "string";
-		var args = widgetSlice.call( arguments, 1 );
-		var returnValue = this;
-
-		if ( isMethodCall ) {
-
-			// If this is an empty collection, we need to have the instance method
-			// return undefined instead of the jQuery instance
-			if ( !this.length && options === "instance" ) {
-				returnValue = undefined;
-			} else {
-				this.each( function() {
-					var methodValue;
-					var instance = $.data( this, fullName );
-
-					if ( options === "instance" ) {
-						returnValue = instance;
-						return false;
-					}
-
-					if ( !instance ) {
-						return $.error( "cannot call methods on " + name +
-							" prior to initialization; " +
-							"attempted to call method '" + options + "'" );
-					}
-
-					if ( !$.isFunction( instance[ options ] ) || options.charAt( 0 ) === "_" ) {
-						return $.error( "no such method '" + options + "' for " + name +
-							" widget instance" );
-					}
-
-					methodValue = instance[ options ].apply( instance, args );
-
-					if ( methodValue !== instance && methodValue !== undefined ) {
-						returnValue = methodValue && methodValue.jquery ?
-							returnValue.pushStack( methodValue.get() ) :
-							methodValue;
-						return false;
-					}
-				} );
-			}
-		} else {
-
-			// Allow multiple hashes to be passed on init
-			if ( args.length ) {
-				options = $.widget.extend.apply( null, [ options ].concat( args ) );
-			}
-
-			this.each( function() {
-				var instance = $.data( this, fullName );
-				if ( instance ) {
-					instance.option( options || {} );
-					if ( instance._init ) {
-						instance._init();
-					}
-				} else {
-					$.data( this, fullName, new object( options, this ) );
-				}
-			} );
-		}
-
-		return returnValue;
-	};
-};
-
-$.Widget = function( /* options, element */ ) {};
-$.Widget._childConstructors = [];
-
-$.Widget.prototype = {
-	widgetName: "widget",
-	widgetEventPrefix: "",
-	defaultElement: "<div>",
-
-	options: {
-		classes: {},
-		disabled: false,
-
-		// Callbacks
-		create: null
-	},
-
-	_createWidget: function( options, element ) {
-		element = $( element || this.defaultElement || this )[ 0 ];
-		this.element = $( element );
-		this.uuid = widgetUuid++;
-		this.eventNamespace = "." + this.widgetName + this.uuid;
-
-		this.bindings = $();
-		this.hoverable = $();
-		this.focusable = $();
-		this.classesElementLookup = {};
-
-		if ( element !== this ) {
-			$.data( element, this.widgetFullName, this );
-			this._on( true, this.element, {
-				remove: function( event ) {
-					if ( event.target === element ) {
-						this.destroy();
-					}
-				}
-			} );
-			this.document = $( element.style ?
-
-				// Element within the document
-				element.ownerDocument :
-
-				// Element is window or document
-				element.document || element );
-			this.window = $( this.document[ 0 ].defaultView || this.document[ 0 ].parentWindow );
-		}
-
-		this.options = $.widget.extend( {},
-			this.options,
-			this._getCreateOptions(),
-			options );
-
-		this._create();
-
-		if ( this.options.disabled ) {
-			this._setOptionDisabled( this.options.disabled );
-		}
-
-		this._trigger( "create", null, this._getCreateEventData() );
-		this._init();
-	},
-
-	_getCreateOptions: function() {
-		return {};
-	},
-
-	_getCreateEventData: $.noop,
-
-	_create: $.noop,
-
-	_init: $.noop,
-
-	destroy: function() {
-		var that = this;
-
-		this._destroy();
-		$.each( this.classesElementLookup, function( key, value ) {
-			that._removeClass( value, key );
-		} );
-
-		// We can probably remove the unbind calls in 2.0
-		// all event bindings should go through this._on()
-		this.element
-			.off( this.eventNamespace )
-			.removeData( this.widgetFullName );
-		this.widget()
-			.off( this.eventNamespace )
-			.removeAttr( "aria-disabled" );
-
-		// Clean up events and states
-		this.bindings.off( this.eventNamespace );
-	},
-
-	_destroy: $.noop,
-
-	widget: function() {
-		return this.element;
-	},
-
-	option: function( key, value ) {
-		var options = key;
-		var parts;
-		var curOption;
-		var i;
-
-		if ( arguments.length === 0 ) {
-
-			// Don't return a reference to the internal hash
-			return $.widget.extend( {}, this.options );
-		}
-
-		if ( typeof key === "string" ) {
-
-			// Handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
-			options = {};
-			parts = key.split( "." );
-			key = parts.shift();
-			if ( parts.length ) {
-				curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
-				for ( i = 0; i < parts.length - 1; i++ ) {
-					curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
-					curOption = curOption[ parts[ i ] ];
-				}
-				key = parts.pop();
-				if ( arguments.length === 1 ) {
-					return curOption[ key ] === undefined ? null : curOption[ key ];
-				}
-				curOption[ key ] = value;
-			} else {
-				if ( arguments.length === 1 ) {
-					return this.options[ key ] === undefined ? null : this.options[ key ];
-				}
-				options[ key ] = value;
-			}
-		}
-
-		this._setOptions( options );
-
-		return this;
-	},
-
-	_setOptions: function( options ) {
-		var key;
-
-		for ( key in options ) {
-			this._setOption( key, options[ key ] );
-		}
-
-		return this;
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "classes" ) {
-			this._setOptionClasses( value );
-		}
-
-		this.options[ key ] = value;
-
-		if ( key === "disabled" ) {
-			this._setOptionDisabled( value );
-		}
-
-		return this;
-	},
-
-	_setOptionClasses: function( value ) {
-		var classKey, elements, currentElements;
-
-		for ( classKey in value ) {
-			currentElements = this.classesElementLookup[ classKey ];
-			if ( value[ classKey ] === this.options.classes[ classKey ] ||
-					!currentElements ||
-					!currentElements.length ) {
-				continue;
-			}
-
-			// We are doing this to create a new jQuery object because the _removeClass() call
-			// on the next line is going to destroy the reference to the current elements being
-			// tracked. We need to save a copy of this collection so that we can add the new classes
-			// below.
-			elements = $( currentElements.get() );
-			this._removeClass( currentElements, classKey );
-
-			// We don't use _addClass() here, because that uses this.options.classes
-			// for generating the string of classes. We want to use the value passed in from
-			// _setOption(), this is the new value of the classes option which was passed to
-			// _setOption(). We pass this value directly to _classes().
-			elements.addClass( this._classes( {
-				element: elements,
-				keys: classKey,
-				classes: value,
-				add: true
-			} ) );
-		}
-	},
-
-	_setOptionDisabled: function( value ) {
-		this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null, !!value );
-
-		// If the widget is becoming disabled, then nothing is interactive
-		if ( value ) {
-			this._removeClass( this.hoverable, null, "ui-state-hover" );
-			this._removeClass( this.focusable, null, "ui-state-focus" );
-		}
-	},
-
-	enable: function() {
-		return this._setOptions( { disabled: false } );
-	},
-
-	disable: function() {
-		return this._setOptions( { disabled: true } );
-	},
-
-	_classes: function( options ) {
-		var full = [];
-		var that = this;
-
-		options = $.extend( {
-			element: this.element,
-			classes: this.options.classes || {}
-		}, options );
-
-		function processClassString( classes, checkOption ) {
-			var current, i;
-			for ( i = 0; i < classes.length; i++ ) {
-				current = that.classesElementLookup[ classes[ i ] ] || $();
-				if ( options.add ) {
-					current = $( $.unique( current.get().concat( options.element.get() ) ) );
-				} else {
-					current = $( current.not( options.element ).get() );
-				}
-				that.classesElementLookup[ classes[ i ] ] = current;
-				full.push( classes[ i ] );
-				if ( checkOption && options.classes[ classes[ i ] ] ) {
-					full.push( options.classes[ classes[ i ] ] );
-				}
-			}
-		}
-
-		this._on( options.element, {
-			"remove": "_untrackClassesElement"
-		} );
-
-		if ( options.keys ) {
-			processClassString( options.keys.match( /\S+/g ) || [], true );
-		}
-		if ( options.extra ) {
-			processClassString( options.extra.match( /\S+/g ) || [] );
-		}
-
-		return full.join( " " );
-	},
-
-	_untrackClassesElement: function( event ) {
-		var that = this;
-		$.each( that.classesElementLookup, function( key, value ) {
-			if ( $.inArray( event.target, value ) !== -1 ) {
-				that.classesElementLookup[ key ] = $( value.not( event.target ).get() );
-			}
-		} );
-	},
-
-	_removeClass: function( element, keys, extra ) {
-		return this._toggleClass( element, keys, extra, false );
-	},
-
-	_addClass: function( element, keys, extra ) {
-		return this._toggleClass( element, keys, extra, true );
-	},
-
-	_toggleClass: function( element, keys, extra, add ) {
-		add = ( typeof add === "boolean" ) ? add : extra;
-		var shift = ( typeof element === "string" || element === null ),
-			options = {
-				extra: shift ? keys : extra,
-				keys: shift ? element : keys,
-				element: shift ? this.element : element,
-				add: add
-			};
-		options.element.toggleClass( this._classes( options ), add );
-		return this;
-	},
-
-	_on: function( suppressDisabledCheck, element, handlers ) {
-		var delegateElement;
-		var instance = this;
-
-		// No suppressDisabledCheck flag, shuffle arguments
-		if ( typeof suppressDisabledCheck !== "boolean" ) {
-			handlers = element;
-			element = suppressDisabledCheck;
-			suppressDisabledCheck = false;
-		}
-
-		// No element argument, shuffle and use this.element
-		if ( !handlers ) {
-			handlers = element;
-			element = this.element;
-			delegateElement = this.widget();
-		} else {
-			element = delegateElement = $( element );
-			this.bindings = this.bindings.add( element );
-		}
-
-		$.each( handlers, function( event, handler ) {
-			function handlerProxy() {
-
-				// Allow widgets to customize the disabled handling
-				// - disabled as an array instead of boolean
-				// - disabled class as method for disabling individual parts
-				if ( !suppressDisabledCheck &&
-						( instance.options.disabled === true ||
-						$( this ).hasClass( "ui-state-disabled" ) ) ) {
-					return;
-				}
-				return ( typeof handler === "string" ? instance[ handler ] : handler )
-					.apply( instance, arguments );
-			}
-
-			// Copy the guid so direct unbinding works
-			if ( typeof handler !== "string" ) {
-				handlerProxy.guid = handler.guid =
-					handler.guid || handlerProxy.guid || $.guid++;
-			}
-
-			var match = event.match( /^([\w:-]*)\s*(.*)$/ );
-			var eventName = match[ 1 ] + instance.eventNamespace;
-			var selector = match[ 2 ];
-
-			if ( selector ) {
-				delegateElement.on( eventName, selector, handlerProxy );
-			} else {
-				element.on( eventName, handlerProxy );
-			}
-		} );
-	},
-
-	_off: function( element, eventName ) {
-		eventName = ( eventName || "" ).split( " " ).join( this.eventNamespace + " " ) +
-			this.eventNamespace;
-		element.off( eventName ).off( eventName );
-
-		// Clear the stack to avoid memory leaks (#10056)
-		this.bindings = $( this.bindings.not( element ).get() );
-		this.focusable = $( this.focusable.not( element ).get() );
-		this.hoverable = $( this.hoverable.not( element ).get() );
-	},
-
-	_delay: function( handler, delay ) {
-		function handlerProxy() {
-			return ( typeof handler === "string" ? instance[ handler ] : handler )
-				.apply( instance, arguments );
-		}
-		var instance = this;
-		return setTimeout( handlerProxy, delay || 0 );
-	},
-
-	_hoverable: function( element ) {
-		this.hoverable = this.hoverable.add( element );
-		this._on( element, {
-			mouseenter: function( event ) {
-				this._addClass( $( event.currentTarget ), null, "ui-state-hover" );
-			},
-			mouseleave: function( event ) {
-				this._removeClass( $( event.currentTarget ), null, "ui-state-hover" );
-			}
-		} );
-	},
-
-	_focusable: function( element ) {
-		this.focusable = this.focusable.add( element );
-		this._on( element, {
-			focusin: function( event ) {
-				this._addClass( $( event.currentTarget ), null, "ui-state-focus" );
-			},
-			focusout: function( event ) {
-				this._removeClass( $( event.currentTarget ), null, "ui-state-focus" );
-			}
-		} );
-	},
-
-	_trigger: function( type, event, data ) {
-		var prop, orig;
-		var callback = this.options[ type ];
-
-		data = data || {};
-		event = $.Event( event );
-		event.type = ( type === this.widgetEventPrefix ?
-			type :
-			this.widgetEventPrefix + type ).toLowerCase();
-
-		// The original event may come from any element
-		// so we need to reset the target on the new event
-		event.target = this.element[ 0 ];
-
-		// Copy original event properties over to the new event
-		orig = event.originalEvent;
-		if ( orig ) {
-			for ( prop in orig ) {
-				if ( !( prop in event ) ) {
-					event[ prop ] = orig[ prop ];
-				}
-			}
-		}
-
-		this.element.trigger( event, data );
-		return !( $.isFunction( callback ) &&
-			callback.apply( this.element[ 0 ], [ event ].concat( data ) ) === false ||
-			event.isDefaultPrevented() );
-	}
-};
-
-$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
-	$.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
-		if ( typeof options === "string" ) {
-			options = { effect: options };
-		}
-
-		var hasOptions;
-		var effectName = !options ?
-			method :
-			options === true || typeof options === "number" ?
-				defaultEffect :
-				options.effect || defaultEffect;
-
-		options = options || {};
-		if ( typeof options === "number" ) {
-			options = { duration: options };
-		}
-
-		hasOptions = !$.isEmptyObject( options );
-		options.complete = callback;
-
-		if ( options.delay ) {
-			element.delay( options.delay );
-		}
-
-		if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
-			element[ method ]( options );
-		} else if ( effectName !== method && element[ effectName ] ) {
-			element[ effectName ]( options.duration, options.easing, callback );
-		} else {
-			element.queue( function( next ) {
-				$( this )[ method ]();
-				if ( callback ) {
-					callback.call( element[ 0 ] );
-				}
-				next();
-			} );
-		}
-	};
-} );
-
-var widget = $.widget;
-
-
-/*!
- * jQuery UI Position 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/position/
- */
-
-//>>label: Position
-//>>group: Core
-//>>description: Positions elements relative to other elements.
-//>>docs: http://api.jqueryui.com/position/
-//>>demos: http://jqueryui.com/position/
-
-
-( function() {
-var cachedScrollbarWidth,
-	max = Math.max,
-	abs = Math.abs,
-	rhorizontal = /left|center|right/,
-	rvertical = /top|center|bottom/,
-	roffset = /[\+\-]\d+(\.[\d]+)?%?/,
-	rposition = /^\w+/,
-	rpercent = /%$/,
-	_position = $.fn.position;
-
-function getOffsets( offsets, width, height ) {
-	return [
-		parseFloat( offsets[ 0 ] ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
-		parseFloat( offsets[ 1 ] ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
-	];
-}
-
-function parseCss( element, property ) {
-	return parseInt( $.css( element, property ), 10 ) || 0;
-}
-
-function getDimensions( elem ) {
-	var raw = elem[ 0 ];
-	if ( raw.nodeType === 9 ) {
-		return {
-			width: elem.width(),
-			height: elem.height(),
-			offset: { top: 0, left: 0 }
-		};
-	}
-	if ( $.isWindow( raw ) ) {
-		return {
-			width: elem.width(),
-			height: elem.height(),
-			offset: { top: elem.scrollTop(), left: elem.scrollLeft() }
-		};
-	}
-	if ( raw.preventDefault ) {
-		return {
-			width: 0,
-			height: 0,
-			offset: { top: raw.pageY, left: raw.pageX }
-		};
-	}
-	return {
-		width: elem.outerWidth(),
-		height: elem.outerHeight(),
-		offset: elem.offset()
-	};
-}
-
-$.position = {
-	scrollbarWidth: function() {
-		if ( cachedScrollbarWidth !== undefined ) {
-			return cachedScrollbarWidth;
-		}
-		var w1, w2,
-			div = $( "<div " +
-				"style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'>" +
-				"<div style='height:100px;width:auto;'></div></div>" ),
-			innerDiv = div.children()[ 0 ];
-
-		$( "body" ).append( div );
-		w1 = innerDiv.offsetWidth;
-		div.css( "overflow", "scroll" );
-
-		w2 = innerDiv.offsetWidth;
-
-		if ( w1 === w2 ) {
-			w2 = div[ 0 ].clientWidth;
-		}
-
-		div.remove();
-
-		return ( cachedScrollbarWidth = w1 - w2 );
-	},
-	getScrollInfo: function( within ) {
-		var overflowX = within.isWindow || within.isDocument ? "" :
-				within.element.css( "overflow-x" ),
-			overflowY = within.isWindow || within.isDocument ? "" :
-				within.element.css( "overflow-y" ),
-			hasOverflowX = overflowX === "scroll" ||
-				( overflowX === "auto" && within.width < within.element[ 0 ].scrollWidth ),
-			hasOverflowY = overflowY === "scroll" ||
-				( overflowY === "auto" && within.height < within.element[ 0 ].scrollHeight );
-		return {
-			width: hasOverflowY ? $.position.scrollbarWidth() : 0,
-			height: hasOverflowX ? $.position.scrollbarWidth() : 0
-		};
-	},
-	getWithinInfo: function( element ) {
-		var withinElement = $( element || window ),
-			isWindow = $.isWindow( withinElement[ 0 ] ),
-			isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9,
-			hasOffset = !isWindow && !isDocument;
-		return {
-			element: withinElement,
-			isWindow: isWindow,
-			isDocument: isDocument,
-			offset: hasOffset ? $( element ).offset() : { left: 0, top: 0 },
-			scrollLeft: withinElement.scrollLeft(),
-			scrollTop: withinElement.scrollTop(),
-			width: withinElement.outerWidth(),
-			height: withinElement.outerHeight()
-		};
-	}
-};
-
-$.fn.position = function( options ) {
-	if ( !options || !options.of ) {
-		return _position.apply( this, arguments );
-	}
-
-	// Make a copy, we don't want to modify arguments
-	options = $.extend( {}, options );
-
-	var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
-		target = $( options.of ),
-		within = $.position.getWithinInfo( options.within ),
-		scrollInfo = $.position.getScrollInfo( within ),
-		collision = ( options.collision || "flip" ).split( " " ),
-		offsets = {};
-
-	dimensions = getDimensions( target );
-	if ( target[ 0 ].preventDefault ) {
-
-		// Force left top to allow flipping
-		options.at = "left top";
-	}
-	targetWidth = dimensions.width;
-	targetHeight = dimensions.height;
-	targetOffset = dimensions.offset;
-
-	// Clone to reuse original targetOffset later
-	basePosition = $.extend( {}, targetOffset );
-
-	// Force my and at to have valid horizontal and vertical positions
-	// if a value is missing or invalid, it will be converted to center
-	$.each( [ "my", "at" ], function() {
-		var pos = ( options[ this ] || "" ).split( " " ),
-			horizontalOffset,
-			verticalOffset;
-
-		if ( pos.length === 1 ) {
-			pos = rhorizontal.test( pos[ 0 ] ) ?
-				pos.concat( [ "center" ] ) :
-				rvertical.test( pos[ 0 ] ) ?
-					[ "center" ].concat( pos ) :
-					[ "center", "center" ];
-		}
-		pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
-		pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
-
-		// Calculate offsets
-		horizontalOffset = roffset.exec( pos[ 0 ] );
-		verticalOffset = roffset.exec( pos[ 1 ] );
-		offsets[ this ] = [
-			horizontalOffset ? horizontalOffset[ 0 ] : 0,
-			verticalOffset ? verticalOffset[ 0 ] : 0
-		];
-
-		// Reduce to just the positions without the offsets
-		options[ this ] = [
-			rposition.exec( pos[ 0 ] )[ 0 ],
-			rposition.exec( pos[ 1 ] )[ 0 ]
-		];
-	} );
-
-	// Normalize collision option
-	if ( collision.length === 1 ) {
-		collision[ 1 ] = collision[ 0 ];
-	}
-
-	if ( options.at[ 0 ] === "right" ) {
-		basePosition.left += targetWidth;
-	} else if ( options.at[ 0 ] === "center" ) {
-		basePosition.left += targetWidth / 2;
-	}
-
-	if ( options.at[ 1 ] === "bottom" ) {
-		basePosition.top += targetHeight;
-	} else if ( options.at[ 1 ] === "center" ) {
-		basePosition.top += targetHeight / 2;
-	}
-
-	atOffset = getOffsets( offsets.at, targetWidth, targetHeight );
-	basePosition.left += atOffset[ 0 ];
-	basePosition.top += atOffset[ 1 ];
-
-	return this.each( function() {
-		var collisionPosition, using,
-			elem = $( this ),
-			elemWidth = elem.outerWidth(),
-			elemHeight = elem.outerHeight(),
-			marginLeft = parseCss( this, "marginLeft" ),
-			marginTop = parseCss( this, "marginTop" ),
-			collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) +
-				scrollInfo.width,
-			collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) +
-				scrollInfo.height,
-			position = $.extend( {}, basePosition ),
-			myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() );
-
-		if ( options.my[ 0 ] === "right" ) {
-			position.left -= elemWidth;
-		} else if ( options.my[ 0 ] === "center" ) {
-			position.left -= elemWidth / 2;
-		}
-
-		if ( options.my[ 1 ] === "bottom" ) {
-			position.top -= elemHeight;
-		} else if ( options.my[ 1 ] === "center" ) {
-			position.top -= elemHeight / 2;
-		}
-
-		position.left += myOffset[ 0 ];
-		position.top += myOffset[ 1 ];
-
-		collisionPosition = {
-			marginLeft: marginLeft,
-			marginTop: marginTop
-		};
-
-		$.each( [ "left", "top" ], function( i, dir ) {
-			if ( $.ui.position[ collision[ i ] ] ) {
-				$.ui.position[ collision[ i ] ][ dir ]( position, {
-					targetWidth: targetWidth,
-					targetHeight: targetHeight,
-					elemWidth: elemWidth,
-					elemHeight: elemHeight,
-					collisionPosition: collisionPosition,
-					collisionWidth: collisionWidth,
-					collisionHeight: collisionHeight,
-					offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ],
-					my: options.my,
-					at: options.at,
-					within: within,
-					elem: elem
-				} );
-			}
-		} );
-
-		if ( options.using ) {
-
-			// Adds feedback as second argument to using callback, if present
-			using = function( props ) {
-				var left = targetOffset.left - position.left,
-					right = left + targetWidth - elemWidth,
-					top = targetOffset.top - position.top,
-					bottom = top + targetHeight - elemHeight,
-					feedback = {
-						target: {
-							element: target,
-							left: targetOffset.left,
-							top: targetOffset.top,
-							width: targetWidth,
-							height: targetHeight
-						},
-						element: {
-							element: elem,
-							left: position.left,
-							top: position.top,
-							width: elemWidth,
-							height: elemHeight
-						},
-						horizontal: right < 0 ? "left" : left > 0 ? "right" : "center",
-						vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"
-					};
-				if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) {
-					feedback.horizontal = "center";
-				}
-				if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) {
-					feedback.vertical = "middle";
-				}
-				if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) {
-					feedback.important = "horizontal";
-				} else {
-					feedback.important = "vertical";
-				}
-				options.using.call( this, props, feedback );
-			};
-		}
-
-		elem.offset( $.extend( position, { using: using } ) );
-	} );
-};
-
-$.ui.position = {
-	fit: {
-		left: function( position, data ) {
-			var within = data.within,
-				withinOffset = within.isWindow ? within.scrollLeft : within.offset.left,
-				outerWidth = within.width,
-				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
-				overLeft = withinOffset - collisionPosLeft,
-				overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
-				newOverRight;
-
-			// Element is wider than within
-			if ( data.collisionWidth > outerWidth ) {
-
-				// Element is initially over the left side of within
-				if ( overLeft > 0 && overRight <= 0 ) {
-					newOverRight = position.left + overLeft + data.collisionWidth - outerWidth -
-						withinOffset;
-					position.left += overLeft - newOverRight;
-
-				// Element is initially over right side of within
-				} else if ( overRight > 0 && overLeft <= 0 ) {
-					position.left = withinOffset;
-
-				// Element is initially over both left and right sides of within
-				} else {
-					if ( overLeft > overRight ) {
-						position.left = withinOffset + outerWidth - data.collisionWidth;
-					} else {
-						position.left = withinOffset;
-					}
-				}
-
-			// Too far left -> align with left edge
-			} else if ( overLeft > 0 ) {
-				position.left += overLeft;
-
-			// Too far right -> align with right edge
-			} else if ( overRight > 0 ) {
-				position.left -= overRight;
-
-			// Adjust based on position and margin
-			} else {
-				position.left = max( position.left - collisionPosLeft, position.left );
-			}
-		},
-		top: function( position, data ) {
-			var within = data.within,
-				withinOffset = within.isWindow ? within.scrollTop : within.offset.top,
-				outerHeight = data.within.height,
-				collisionPosTop = position.top - data.collisionPosition.marginTop,
-				overTop = withinOffset - collisionPosTop,
-				overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
-				newOverBottom;
-
-			// Element is taller than within
-			if ( data.collisionHeight > outerHeight ) {
-
-				// Element is initially over the top of within
-				if ( overTop > 0 && overBottom <= 0 ) {
-					newOverBottom = position.top + overTop + data.collisionHeight - outerHeight -
-						withinOffset;
-					position.top += overTop - newOverBottom;
-
-				// Element is initially over bottom of within
-				} else if ( overBottom > 0 && overTop <= 0 ) {
-					position.top = withinOffset;
-
-				// Element is initially over both top and bottom of within
-				} else {
-					if ( overTop > overBottom ) {
-						position.top = withinOffset + outerHeight - data.collisionHeight;
-					} else {
-						position.top = withinOffset;
-					}
-				}
-
-			// Too far up -> align with top
-			} else if ( overTop > 0 ) {
-				position.top += overTop;
-
-			// Too far down -> align with bottom edge
-			} else if ( overBottom > 0 ) {
-				position.top -= overBottom;
-
-			// Adjust based on position and margin
-			} else {
-				position.top = max( position.top - collisionPosTop, position.top );
-			}
-		}
-	},
-	flip: {
-		left: function( position, data ) {
-			var within = data.within,
-				withinOffset = within.offset.left + within.scrollLeft,
-				outerWidth = within.width,
-				offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left,
-				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
-				overLeft = collisionPosLeft - offsetLeft,
-				overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft,
-				myOffset = data.my[ 0 ] === "left" ?
-					-data.elemWidth :
-					data.my[ 0 ] === "right" ?
-						data.elemWidth :
-						0,
-				atOffset = data.at[ 0 ] === "left" ?
-					data.targetWidth :
-					data.at[ 0 ] === "right" ?
-						-data.targetWidth :
-						0,
-				offset = -2 * data.offset[ 0 ],
-				newOverRight,
-				newOverLeft;
-
-			if ( overLeft < 0 ) {
-				newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth -
-					outerWidth - withinOffset;
-				if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
-					position.left += myOffset + atOffset + offset;
-				}
-			} else if ( overRight > 0 ) {
-				newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset +
-					atOffset + offset - offsetLeft;
-				if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
-					position.left += myOffset + atOffset + offset;
-				}
-			}
-		},
-		top: function( position, data ) {
-			var within = data.within,
-				withinOffset = within.offset.top + within.scrollTop,
-				outerHeight = within.height,
-				offsetTop = within.isWindow ? within.scrollTop : within.offset.top,
-				collisionPosTop = position.top - data.collisionPosition.marginTop,
-				overTop = collisionPosTop - offsetTop,
-				overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop,
-				top = data.my[ 1 ] === "top",
-				myOffset = top ?
-					-data.elemHeight :
-					data.my[ 1 ] === "bottom" ?
-						data.elemHeight :
-						0,
-				atOffset = data.at[ 1 ] === "top" ?
-					data.targetHeight :
-					data.at[ 1 ] === "bottom" ?
-						-data.targetHeight :
-						0,
-				offset = -2 * data.offset[ 1 ],
-				newOverTop,
-				newOverBottom;
-			if ( overTop < 0 ) {
-				newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight -
-					outerHeight - withinOffset;
-				if ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) {
-					position.top += myOffset + atOffset + offset;
-				}
-			} else if ( overBottom > 0 ) {
-				newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset +
-					offset - offsetTop;
-				if ( newOverTop > 0 || abs( newOverTop ) < overBottom ) {
-					position.top += myOffset + atOffset + offset;
-				}
-			}
-		}
-	},
-	flipfit: {
-		left: function() {
-			$.ui.position.flip.left.apply( this, arguments );
-			$.ui.position.fit.left.apply( this, arguments );
-		},
-		top: function() {
-			$.ui.position.flip.top.apply( this, arguments );
-			$.ui.position.fit.top.apply( this, arguments );
-		}
-	}
-};
-
-} )();
-
-var position = $.ui.position;
-
-
-/*!
- * jQuery UI :data 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: :data Selector
-//>>group: Core
-//>>description: Selects elements which have data stored under the specified key.
-//>>docs: http://api.jqueryui.com/data-selector/
-
-
-var data = $.extend( $.expr[ ":" ], {
-	data: $.expr.createPseudo ?
-		$.expr.createPseudo( function( dataName ) {
-			return function( elem ) {
-				return !!$.data( elem, dataName );
-			};
-		} ) :
-
-		// Support: jQuery <1.8
-		function( elem, i, match ) {
-			return !!$.data( elem, match[ 3 ] );
-		}
-} );
-
-/*!
- * jQuery UI Disable Selection 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: disableSelection
-//>>group: Core
-//>>description: Disable selection of text content within the set of matched elements.
-//>>docs: http://api.jqueryui.com/disableSelection/
-
-// This file is deprecated
-
-
-var disableSelection = $.fn.extend( {
-	disableSelection: ( function() {
-		var eventType = "onselectstart" in document.createElement( "div" ) ?
-			"selectstart" :
-			"mousedown";
-
-		return function() {
-			return this.on( eventType + ".ui-disableSelection", function( event ) {
-				event.preventDefault();
-			} );
-		};
-	} )(),
-
-	enableSelection: function() {
-		return this.off( ".ui-disableSelection" );
-	}
-} );
-
-
-/*!
- * jQuery UI Effects 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Effects Core
-//>>group: Effects
-// jscs:disable maximumLineLength
-//>>description: Extends the internal jQuery effects. Includes morphing and easing. Required by all other effects.
-// jscs:enable maximumLineLength
-//>>docs: http://api.jqueryui.com/category/effects-core/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var dataSpace = "ui-effects-",
-	dataSpaceStyle = "ui-effects-style",
-	dataSpaceAnimated = "ui-effects-animated",
-
-	// Create a local jQuery because jQuery Color relies on it and the
-	// global may not exist with AMD and a custom build (#10199)
-	jQuery = $;
-
-$.effects = {
-	effect: {}
-};
-
-/*!
- * jQuery Color Animations v2.1.2
- * https://github.com/jquery/jquery-color
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * Date: Wed Jan 16 08:47:09 2013 -0600
- */
-( function( jQuery, undefined ) {
-
-	var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor " +
-		"borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",
-
-	// Plusequals test for += 100 -= 100
-	rplusequals = /^([\-+])=\s*(\d+\.?\d*)/,
-
-	// A set of RE's that can match strings and generate color tuples.
-	stringParsers = [ {
-			re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ],
-					execResult[ 2 ],
-					execResult[ 3 ],
-					execResult[ 4 ]
-				];
-			}
-		}, {
-			re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ] * 2.55,
-					execResult[ 2 ] * 2.55,
-					execResult[ 3 ] * 2.55,
-					execResult[ 4 ]
-				];
-			}
-		}, {
-
-			// This regex ignores A-F because it's compared against an already lowercased string
-			re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,
-			parse: function( execResult ) {
-				return [
-					parseInt( execResult[ 1 ], 16 ),
-					parseInt( execResult[ 2 ], 16 ),
-					parseInt( execResult[ 3 ], 16 )
-				];
-			}
-		}, {
-
-			// This regex ignores A-F because it's compared against an already lowercased string
-			re: /#([a-f0-9])([a-f0-9])([a-f0-9])/,
-			parse: function( execResult ) {
-				return [
-					parseInt( execResult[ 1 ] + execResult[ 1 ], 16 ),
-					parseInt( execResult[ 2 ] + execResult[ 2 ], 16 ),
-					parseInt( execResult[ 3 ] + execResult[ 3 ], 16 )
-				];
-			}
-		}, {
-			re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
-			space: "hsla",
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ],
-					execResult[ 2 ] / 100,
-					execResult[ 3 ] / 100,
-					execResult[ 4 ]
-				];
-			}
-		} ],
-
-	// JQuery.Color( )
-	color = jQuery.Color = function( color, green, blue, alpha ) {
-		return new jQuery.Color.fn.parse( color, green, blue, alpha );
-	},
-	spaces = {
-		rgba: {
-			props: {
-				red: {
-					idx: 0,
-					type: "byte"
-				},
-				green: {
-					idx: 1,
-					type: "byte"
-				},
-				blue: {
-					idx: 2,
-					type: "byte"
-				}
-			}
-		},
-
-		hsla: {
-			props: {
-				hue: {
-					idx: 0,
-					type: "degrees"
-				},
-				saturation: {
-					idx: 1,
-					type: "percent"
-				},
-				lightness: {
-					idx: 2,
-					type: "percent"
-				}
-			}
-		}
-	},
-	propTypes = {
-		"byte": {
-			floor: true,
-			max: 255
-		},
-		"percent": {
-			max: 1
-		},
-		"degrees": {
-			mod: 360,
-			floor: true
-		}
-	},
-	support = color.support = {},
-
-	// Element for support tests
-	supportElem = jQuery( "<p>" )[ 0 ],
-
-	// Colors = jQuery.Color.names
-	colors,
-
-	// Local aliases of functions called often
-	each = jQuery.each;
-
-// Determine rgba support immediately
-supportElem.style.cssText = "background-color:rgba(1,1,1,.5)";
-support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1;
-
-// Define cache name and alpha properties
-// for rgba and hsla spaces
-each( spaces, function( spaceName, space ) {
-	space.cache = "_" + spaceName;
-	space.props.alpha = {
-		idx: 3,
-		type: "percent",
-		def: 1
-	};
-} );
-
-function clamp( value, prop, allowEmpty ) {
-	var type = propTypes[ prop.type ] || {};
-
-	if ( value == null ) {
-		return ( allowEmpty || !prop.def ) ? null : prop.def;
-	}
-
-	// ~~ is an short way of doing floor for positive numbers
-	value = type.floor ? ~~value : parseFloat( value );
-
-	// IE will pass in empty strings as value for alpha,
-	// which will hit this case
-	if ( isNaN( value ) ) {
-		return prop.def;
-	}
-
-	if ( type.mod ) {
-
-		// We add mod before modding to make sure that negatives values
-		// get converted properly: -10 -> 350
-		return ( value + type.mod ) % type.mod;
-	}
-
-	// For now all property types without mod have min and max
-	return 0 > value ? 0 : type.max < value ? type.max : value;
-}
-
-function stringParse( string ) {
-	var inst = color(),
-		rgba = inst._rgba = [];
-
-	string = string.toLowerCase();
-
-	each( stringParsers, function( i, parser ) {
-		var parsed,
-			match = parser.re.exec( string ),
-			values = match && parser.parse( match ),
-			spaceName = parser.space || "rgba";
-
-		if ( values ) {
-			parsed = inst[ spaceName ]( values );
-
-			// If this was an rgba parse the assignment might happen twice
-			// oh well....
-			inst[ spaces[ spaceName ].cache ] = parsed[ spaces[ spaceName ].cache ];
-			rgba = inst._rgba = parsed._rgba;
-
-			// Exit each( stringParsers ) here because we matched
-			return false;
-		}
-	} );
-
-	// Found a stringParser that handled it
-	if ( rgba.length ) {
-
-		// If this came from a parsed string, force "transparent" when alpha is 0
-		// chrome, (and maybe others) return "transparent" as rgba(0,0,0,0)
-		if ( rgba.join() === "0,0,0,0" ) {
-			jQuery.extend( rgba, colors.transparent );
-		}
-		return inst;
-	}
-
-	// Named colors
-	return colors[ string ];
-}
-
-color.fn = jQuery.extend( color.prototype, {
-	parse: function( red, green, blue, alpha ) {
-		if ( red === undefined ) {
-			this._rgba = [ null, null, null, null ];
-			return this;
-		}
-		if ( red.jquery || red.nodeType ) {
-			red = jQuery( red ).css( green );
-			green = undefined;
-		}
-
-		var inst = this,
-			type = jQuery.type( red ),
-			rgba = this._rgba = [];
-
-		// More than 1 argument specified - assume ( red, green, blue, alpha )
-		if ( green !== undefined ) {
-			red = [ red, green, blue, alpha ];
-			type = "array";
-		}
-
-		if ( type === "string" ) {
-			return this.parse( stringParse( red ) || colors._default );
-		}
-
-		if ( type === "array" ) {
-			each( spaces.rgba.props, function( key, prop ) {
-				rgba[ prop.idx ] = clamp( red[ prop.idx ], prop );
-			} );
-			return this;
-		}
-
-		if ( type === "object" ) {
-			if ( red instanceof color ) {
-				each( spaces, function( spaceName, space ) {
-					if ( red[ space.cache ] ) {
-						inst[ space.cache ] = red[ space.cache ].slice();
-					}
-				} );
-			} else {
-				each( spaces, function( spaceName, space ) {
-					var cache = space.cache;
-					each( space.props, function( key, prop ) {
-
-						// If the cache doesn't exist, and we know how to convert
-						if ( !inst[ cache ] && space.to ) {
-
-							// If the value was null, we don't need to copy it
-							// if the key was alpha, we don't need to copy it either
-							if ( key === "alpha" || red[ key ] == null ) {
-								return;
-							}
-							inst[ cache ] = space.to( inst._rgba );
-						}
-
-						// This is the only case where we allow nulls for ALL properties.
-						// call clamp with alwaysAllowEmpty
-						inst[ cache ][ prop.idx ] = clamp( red[ key ], prop, true );
-					} );
-
-					// Everything defined but alpha?
-					if ( inst[ cache ] &&
-							jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
-
-						// Use the default of 1
-						inst[ cache ][ 3 ] = 1;
-						if ( space.from ) {
-							inst._rgba = space.from( inst[ cache ] );
-						}
-					}
-				} );
-			}
-			return this;
-		}
-	},
-	is: function( compare ) {
-		var is = color( compare ),
-			same = true,
-			inst = this;
-
-		each( spaces, function( _, space ) {
-			var localCache,
-				isCache = is[ space.cache ];
-			if ( isCache ) {
-				localCache = inst[ space.cache ] || space.to && space.to( inst._rgba ) || [];
-				each( space.props, function( _, prop ) {
-					if ( isCache[ prop.idx ] != null ) {
-						same = ( isCache[ prop.idx ] === localCache[ prop.idx ] );
-						return same;
-					}
-				} );
-			}
-			return same;
-		} );
-		return same;
-	},
-	_space: function() {
-		var used = [],
-			inst = this;
-		each( spaces, function( spaceName, space ) {
-			if ( inst[ space.cache ] ) {
-				used.push( spaceName );
-			}
-		} );
-		return used.pop();
-	},
-	transition: function( other, distance ) {
-		var end = color( other ),
-			spaceName = end._space(),
-			space = spaces[ spaceName ],
-			startColor = this.alpha() === 0 ? color( "transparent" ) : this,
-			start = startColor[ space.cache ] || space.to( startColor._rgba ),
-			result = start.slice();
-
-		end = end[ space.cache ];
-		each( space.props, function( key, prop ) {
-			var index = prop.idx,
-				startValue = start[ index ],
-				endValue = end[ index ],
-				type = propTypes[ prop.type ] || {};
-
-			// If null, don't override start value
-			if ( endValue === null ) {
-				return;
-			}
-
-			// If null - use end
-			if ( startValue === null ) {
-				result[ index ] = endValue;
-			} else {
-				if ( type.mod ) {
-					if ( endValue - startValue > type.mod / 2 ) {
-						startValue += type.mod;
-					} else if ( startValue - endValue > type.mod / 2 ) {
-						startValue -= type.mod;
-					}
-				}
-				result[ index ] = clamp( ( endValue - startValue ) * distance + startValue, prop );
-			}
-		} );
-		return this[ spaceName ]( result );
-	},
-	blend: function( opaque ) {
-
-		// If we are already opaque - return ourself
-		if ( this._rgba[ 3 ] === 1 ) {
-			return this;
-		}
-
-		var rgb = this._rgba.slice(),
-			a = rgb.pop(),
-			blend = color( opaque )._rgba;
-
-		return color( jQuery.map( rgb, function( v, i ) {
-			return ( 1 - a ) * blend[ i ] + a * v;
-		} ) );
-	},
-	toRgbaString: function() {
-		var prefix = "rgba(",
-			rgba = jQuery.map( this._rgba, function( v, i ) {
-				return v == null ? ( i > 2 ? 1 : 0 ) : v;
-			} );
-
-		if ( rgba[ 3 ] === 1 ) {
-			rgba.pop();
-			prefix = "rgb(";
-		}
-
-		return prefix + rgba.join() + ")";
-	},
-	toHslaString: function() {
-		var prefix = "hsla(",
-			hsla = jQuery.map( this.hsla(), function( v, i ) {
-				if ( v == null ) {
-					v = i > 2 ? 1 : 0;
-				}
-
-				// Catch 1 and 2
-				if ( i && i < 3 ) {
-					v = Math.round( v * 100 ) + "%";
-				}
-				return v;
-			} );
-
-		if ( hsla[ 3 ] === 1 ) {
-			hsla.pop();
-			prefix = "hsl(";
-		}
-		return prefix + hsla.join() + ")";
-	},
-	toHexString: function( includeAlpha ) {
-		var rgba = this._rgba.slice(),
-			alpha = rgba.pop();
-
-		if ( includeAlpha ) {
-			rgba.push( ~~( alpha * 255 ) );
-		}
-
-		return "#" + jQuery.map( rgba, function( v ) {
-
-			// Default to 0 when nulls exist
-			v = ( v || 0 ).toString( 16 );
-			return v.length === 1 ? "0" + v : v;
-		} ).join( "" );
-	},
-	toString: function() {
-		return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString();
-	}
-} );
-color.fn.parse.prototype = color.fn;
-
-// Hsla conversions adapted from:
-// https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021
-
-function hue2rgb( p, q, h ) {
-	h = ( h + 1 ) % 1;
-	if ( h * 6 < 1 ) {
-		return p + ( q - p ) * h * 6;
-	}
-	if ( h * 2 < 1 ) {
-		return q;
-	}
-	if ( h * 3 < 2 ) {
-		return p + ( q - p ) * ( ( 2 / 3 ) - h ) * 6;
-	}
-	return p;
-}
-
-spaces.hsla.to = function( rgba ) {
-	if ( rgba[ 0 ] == null || rgba[ 1 ] == null || rgba[ 2 ] == null ) {
-		return [ null, null, null, rgba[ 3 ] ];
-	}
-	var r = rgba[ 0 ] / 255,
-		g = rgba[ 1 ] / 255,
-		b = rgba[ 2 ] / 255,
-		a = rgba[ 3 ],
-		max = Math.max( r, g, b ),
-		min = Math.min( r, g, b ),
-		diff = max - min,
-		add = max + min,
-		l = add * 0.5,
-		h, s;
-
-	if ( min === max ) {
-		h = 0;
-	} else if ( r === max ) {
-		h = ( 60 * ( g - b ) / diff ) + 360;
-	} else if ( g === max ) {
-		h = ( 60 * ( b - r ) / diff ) + 120;
-	} else {
-		h = ( 60 * ( r - g ) / diff ) + 240;
-	}
-
-	// Chroma (diff) == 0 means greyscale which, by definition, saturation = 0%
-	// otherwise, saturation is based on the ratio of chroma (diff) to lightness (add)
-	if ( diff === 0 ) {
-		s = 0;
-	} else if ( l <= 0.5 ) {
-		s = diff / add;
-	} else {
-		s = diff / ( 2 - add );
-	}
-	return [ Math.round( h ) % 360, s, l, a == null ? 1 : a ];
-};
-
-spaces.hsla.from = function( hsla ) {
-	if ( hsla[ 0 ] == null || hsla[ 1 ] == null || hsla[ 2 ] == null ) {
-		return [ null, null, null, hsla[ 3 ] ];
-	}
-	var h = hsla[ 0 ] / 360,
-		s = hsla[ 1 ],
-		l = hsla[ 2 ],
-		a = hsla[ 3 ],
-		q = l <= 0.5 ? l * ( 1 + s ) : l + s - l * s,
-		p = 2 * l - q;
-
-	return [
-		Math.round( hue2rgb( p, q, h + ( 1 / 3 ) ) * 255 ),
-		Math.round( hue2rgb( p, q, h ) * 255 ),
-		Math.round( hue2rgb( p, q, h - ( 1 / 3 ) ) * 255 ),
-		a
-	];
-};
-
-each( spaces, function( spaceName, space ) {
-	var props = space.props,
-		cache = space.cache,
-		to = space.to,
-		from = space.from;
-
-	// Makes rgba() and hsla()
-	color.fn[ spaceName ] = function( value ) {
-
-		// Generate a cache for this space if it doesn't exist
-		if ( to && !this[ cache ] ) {
-			this[ cache ] = to( this._rgba );
-		}
-		if ( value === undefined ) {
-			return this[ cache ].slice();
-		}
-
-		var ret,
-			type = jQuery.type( value ),
-			arr = ( type === "array" || type === "object" ) ? value : arguments,
-			local = this[ cache ].slice();
-
-		each( props, function( key, prop ) {
-			var val = arr[ type === "object" ? key : prop.idx ];
-			if ( val == null ) {
-				val = local[ prop.idx ];
-			}
-			local[ prop.idx ] = clamp( val, prop );
-		} );
-
-		if ( from ) {
-			ret = color( from( local ) );
-			ret[ cache ] = local;
-			return ret;
-		} else {
-			return color( local );
-		}
-	};
-
-	// Makes red() green() blue() alpha() hue() saturation() lightness()
-	each( props, function( key, prop ) {
-
-		// Alpha is included in more than one space
-		if ( color.fn[ key ] ) {
-			return;
-		}
-		color.fn[ key ] = function( value ) {
-			var vtype = jQuery.type( value ),
-				fn = ( key === "alpha" ? ( this._hsla ? "hsla" : "rgba" ) : spaceName ),
-				local = this[ fn ](),
-				cur = local[ prop.idx ],
-				match;
-
-			if ( vtype === "undefined" ) {
-				return cur;
-			}
-
-			if ( vtype === "function" ) {
-				value = value.call( this, cur );
-				vtype = jQuery.type( value );
-			}
-			if ( value == null && prop.empty ) {
-				return this;
-			}
-			if ( vtype === "string" ) {
-				match = rplusequals.exec( value );
-				if ( match ) {
-					value = cur + parseFloat( match[ 2 ] ) * ( match[ 1 ] === "+" ? 1 : -1 );
-				}
-			}
-			local[ prop.idx ] = value;
-			return this[ fn ]( local );
-		};
-	} );
-} );
-
-// Add cssHook and .fx.step function for each named hook.
-// accept a space separated string of properties
-color.hook = function( hook ) {
-	var hooks = hook.split( " " );
-	each( hooks, function( i, hook ) {
-		jQuery.cssHooks[ hook ] = {
-			set: function( elem, value ) {
-				var parsed, curElem,
-					backgroundColor = "";
-
-				if ( value !== "transparent" && ( jQuery.type( value ) !== "string" ||
-						( parsed = stringParse( value ) ) ) ) {
-					value = color( parsed || value );
-					if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
-						curElem = hook === "backgroundColor" ? elem.parentNode : elem;
-						while (
-							( backgroundColor === "" || backgroundColor === "transparent" ) &&
-							curElem && curElem.style
-						) {
-							try {
-								backgroundColor = jQuery.css( curElem, "backgroundColor" );
-								curElem = curElem.parentNode;
-							} catch ( e ) {
-							}
-						}
-
-						value = value.blend( backgroundColor && backgroundColor !== "transparent" ?
-							backgroundColor :
-							"_default" );
-					}
-
-					value = value.toRgbaString();
-				}
-				try {
-					elem.style[ hook ] = value;
-				} catch ( e ) {
-
-					// Wrapped to prevent IE from throwing errors on "invalid" values like
-					// 'auto' or 'inherit'
-				}
-			}
-		};
-		jQuery.fx.step[ hook ] = function( fx ) {
-			if ( !fx.colorInit ) {
-				fx.start = color( fx.elem, hook );
-				fx.end = color( fx.end );
-				fx.colorInit = true;
-			}
-			jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) );
-		};
-	} );
-
-};
-
-color.hook( stepHooks );
-
-jQuery.cssHooks.borderColor = {
-	expand: function( value ) {
-		var expanded = {};
-
-		each( [ "Top", "Right", "Bottom", "Left" ], function( i, part ) {
-			expanded[ "border" + part + "Color" ] = value;
-		} );
-		return expanded;
-	}
-};
-
-// Basic color names only.
-// Usage of any of the other color names requires adding yourself or including
-// jquery.color.svg-names.js.
-colors = jQuery.Color.names = {
-
-	// 4.1. Basic color keywords
-	aqua: "#00ffff",
-	black: "#000000",
-	blue: "#0000ff",
-	fuchsia: "#ff00ff",
-	gray: "#808080",
-	green: "#008000",
-	lime: "#00ff00",
-	maroon: "#800000",
-	navy: "#000080",
-	olive: "#808000",
-	purple: "#800080",
-	red: "#ff0000",
-	silver: "#c0c0c0",
-	teal: "#008080",
-	white: "#ffffff",
-	yellow: "#ffff00",
-
-	// 4.2.3. "transparent" color keyword
-	transparent: [ null, null, null, 0 ],
-
-	_default: "#ffffff"
-};
-
-} )( jQuery );
-
-/******************************************************************************/
-/****************************** CLASS ANIMATIONS ******************************/
-/******************************************************************************/
-( function() {
-
-var classAnimationActions = [ "add", "remove", "toggle" ],
-	shorthandStyles = {
-		border: 1,
-		borderBottom: 1,
-		borderColor: 1,
-		borderLeft: 1,
-		borderRight: 1,
-		borderTop: 1,
-		borderWidth: 1,
-		margin: 1,
-		padding: 1
-	};
-
-$.each(
-	[ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ],
-	function( _, prop ) {
-		$.fx.step[ prop ] = function( fx ) {
-			if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) {
-				jQuery.style( fx.elem, prop, fx.end );
-				fx.setAttr = true;
-			}
-		};
-	}
-);
-
-function getElementStyles( elem ) {
-	var key, len,
-		style = elem.ownerDocument.defaultView ?
-			elem.ownerDocument.defaultView.getComputedStyle( elem, null ) :
-			elem.currentStyle,
-		styles = {};
-
-	if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
-		len = style.length;
-		while ( len-- ) {
-			key = style[ len ];
-			if ( typeof style[ key ] === "string" ) {
-				styles[ $.camelCase( key ) ] = style[ key ];
-			}
-		}
-
-	// Support: Opera, IE <9
-	} else {
-		for ( key in style ) {
-			if ( typeof style[ key ] === "string" ) {
-				styles[ key ] = style[ key ];
-			}
-		}
-	}
-
-	return styles;
-}
-
-function styleDifference( oldStyle, newStyle ) {
-	var diff = {},
-		name, value;
-
-	for ( name in newStyle ) {
-		value = newStyle[ name ];
-		if ( oldStyle[ name ] !== value ) {
-			if ( !shorthandStyles[ name ] ) {
-				if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) {
-					diff[ name ] = value;
-				}
-			}
-		}
-	}
-
-	return diff;
-}
-
-// Support: jQuery <1.8
-if ( !$.fn.addBack ) {
-	$.fn.addBack = function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
-	};
-}
-
-$.effects.animateClass = function( value, duration, easing, callback ) {
-	var o = $.speed( duration, easing, callback );
-
-	return this.queue( function() {
-		var animated = $( this ),
-			baseClass = animated.attr( "class" ) || "",
-			applyClassChange,
-			allAnimations = o.children ? animated.find( "*" ).addBack() : animated;
-
-		// Map the animated objects to store the original styles.
-		allAnimations = allAnimations.map( function() {
-			var el = $( this );
-			return {
-				el: el,
-				start: getElementStyles( this )
-			};
-		} );
-
-		// Apply class change
-		applyClassChange = function() {
-			$.each( classAnimationActions, function( i, action ) {
-				if ( value[ action ] ) {
-					animated[ action + "Class" ]( value[ action ] );
-				}
-			} );
-		};
-		applyClassChange();
-
-		// Map all animated objects again - calculate new styles and diff
-		allAnimations = allAnimations.map( function() {
-			this.end = getElementStyles( this.el[ 0 ] );
-			this.diff = styleDifference( this.start, this.end );
-			return this;
-		} );
-
-		// Apply original class
-		animated.attr( "class", baseClass );
-
-		// Map all animated objects again - this time collecting a promise
-		allAnimations = allAnimations.map( function() {
-			var styleInfo = this,
-				dfd = $.Deferred(),
-				opts = $.extend( {}, o, {
-					queue: false,
-					complete: function() {
-						dfd.resolve( styleInfo );
-					}
-				} );
-
-			this.el.animate( this.diff, opts );
-			return dfd.promise();
-		} );
-
-		// Once all animations have completed:
-		$.when.apply( $, allAnimations.get() ).done( function() {
-
-			// Set the final class
-			applyClassChange();
-
-			// For each animated element,
-			// clear all css properties that were animated
-			$.each( arguments, function() {
-				var el = this.el;
-				$.each( this.diff, function( key ) {
-					el.css( key, "" );
-				} );
-			} );
-
-			// This is guarnteed to be there if you use jQuery.speed()
-			// it also handles dequeuing the next anim...
-			o.complete.call( animated[ 0 ] );
-		} );
-	} );
-};
-
-$.fn.extend( {
-	addClass: ( function( orig ) {
-		return function( classNames, speed, easing, callback ) {
-			return speed ?
-				$.effects.animateClass.call( this,
-					{ add: classNames }, speed, easing, callback ) :
-				orig.apply( this, arguments );
-		};
-	} )( $.fn.addClass ),
-
-	removeClass: ( function( orig ) {
-		return function( classNames, speed, easing, callback ) {
-			return arguments.length > 1 ?
-				$.effects.animateClass.call( this,
-					{ remove: classNames }, speed, easing, callback ) :
-				orig.apply( this, arguments );
-		};
-	} )( $.fn.removeClass ),
-
-	toggleClass: ( function( orig ) {
-		return function( classNames, force, speed, easing, callback ) {
-			if ( typeof force === "boolean" || force === undefined ) {
-				if ( !speed ) {
-
-					// Without speed parameter
-					return orig.apply( this, arguments );
-				} else {
-					return $.effects.animateClass.call( this,
-						( force ? { add: classNames } : { remove: classNames } ),
-						speed, easing, callback );
-				}
-			} else {
-
-				// Without force parameter
-				return $.effects.animateClass.call( this,
-					{ toggle: classNames }, force, speed, easing );
-			}
-		};
-	} )( $.fn.toggleClass ),
-
-	switchClass: function( remove, add, speed, easing, callback ) {
-		return $.effects.animateClass.call( this, {
-			add: add,
-			remove: remove
-		}, speed, easing, callback );
-	}
-} );
-
-} )();
-
-/******************************************************************************/
-/*********************************** EFFECTS **********************************/
-/******************************************************************************/
-
-( function() {
-
-if ( $.expr && $.expr.filters && $.expr.filters.animated ) {
-	$.expr.filters.animated = ( function( orig ) {
-		return function( elem ) {
-			return !!$( elem ).data( dataSpaceAnimated ) || orig( elem );
-		};
-	} )( $.expr.filters.animated );
-}
-
-if ( $.uiBackCompat !== false ) {
-	$.extend( $.effects, {
-
-		// Saves a set of properties in a data storage
-		save: function( element, set ) {
-			var i = 0, length = set.length;
-			for ( ; i < length; i++ ) {
-				if ( set[ i ] !== null ) {
-					element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
-				}
-			}
-		},
-
-		// Restores a set of previously saved properties from a data storage
-		restore: function( element, set ) {
-			var val, i = 0, length = set.length;
-			for ( ; i < length; i++ ) {
-				if ( set[ i ] !== null ) {
-					val = element.data( dataSpace + set[ i ] );
-					element.css( set[ i ], val );
-				}
-			}
-		},
-
-		setMode: function( el, mode ) {
-			if ( mode === "toggle" ) {
-				mode = el.is( ":hidden" ) ? "show" : "hide";
-			}
-			return mode;
-		},
-
-		// Wraps the element around a wrapper that copies position properties
-		createWrapper: function( element ) {
-
-			// If the element is already wrapped, return it
-			if ( element.parent().is( ".ui-effects-wrapper" ) ) {
-				return element.parent();
-			}
-
-			// Wrap the element
-			var props = {
-					width: element.outerWidth( true ),
-					height: element.outerHeight( true ),
-					"float": element.css( "float" )
-				},
-				wrapper = $( "<div></div>" )
-					.addClass( "ui-effects-wrapper" )
-					.css( {
-						fontSize: "100%",
-						background: "transparent",
-						border: "none",
-						margin: 0,
-						padding: 0
-					} ),
-
-				// Store the size in case width/height are defined in % - Fixes #5245
-				size = {
-					width: element.width(),
-					height: element.height()
-				},
-				active = document.activeElement;
-
-			// Support: Firefox
-			// Firefox incorrectly exposes anonymous content
-			// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
-			try {
-				active.id;
-			} catch ( e ) {
-				active = document.body;
-			}
-
-			element.wrap( wrapper );
-
-			// Fixes #7595 - Elements lose focus when wrapped.
-			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-				$( active ).trigger( "focus" );
-			}
-
-			// Hotfix for jQuery 1.4 since some change in wrap() seems to actually
-			// lose the reference to the wrapped element
-			wrapper = element.parent();
-
-			// Transfer positioning properties to the wrapper
-			if ( element.css( "position" ) === "static" ) {
-				wrapper.css( { position: "relative" } );
-				element.css( { position: "relative" } );
-			} else {
-				$.extend( props, {
-					position: element.css( "position" ),
-					zIndex: element.css( "z-index" )
-				} );
-				$.each( [ "top", "left", "bottom", "right" ], function( i, pos ) {
-					props[ pos ] = element.css( pos );
-					if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
-						props[ pos ] = "auto";
-					}
-				} );
-				element.css( {
-					position: "relative",
-					top: 0,
-					left: 0,
-					right: "auto",
-					bottom: "auto"
-				} );
-			}
-			element.css( size );
-
-			return wrapper.css( props ).show();
-		},
-
-		removeWrapper: function( element ) {
-			var active = document.activeElement;
-
-			if ( element.parent().is( ".ui-effects-wrapper" ) ) {
-				element.parent().replaceWith( element );
-
-				// Fixes #7595 - Elements lose focus when wrapped.
-				if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-					$( active ).trigger( "focus" );
-				}
-			}
-
-			return element;
-		}
-	} );
-}
-
-$.extend( $.effects, {
-	version: "1.12.1",
-
-	define: function( name, mode, effect ) {
-		if ( !effect ) {
-			effect = mode;
-			mode = "effect";
-		}
-
-		$.effects.effect[ name ] = effect;
-		$.effects.effect[ name ].mode = mode;
-
-		return effect;
-	},
-
-	scaledDimensions: function( element, percent, direction ) {
-		if ( percent === 0 ) {
-			return {
-				height: 0,
-				width: 0,
-				outerHeight: 0,
-				outerWidth: 0
-			};
-		}
-
-		var x = direction !== "horizontal" ? ( ( percent || 100 ) / 100 ) : 1,
-			y = direction !== "vertical" ? ( ( percent || 100 ) / 100 ) : 1;
-
-		return {
-			height: element.height() * y,
-			width: element.width() * x,
-			outerHeight: element.outerHeight() * y,
-			outerWidth: element.outerWidth() * x
-		};
-
-	},
-
-	clipToBox: function( animation ) {
-		return {
-			width: animation.clip.right - animation.clip.left,
-			height: animation.clip.bottom - animation.clip.top,
-			left: animation.clip.left,
-			top: animation.clip.top
-		};
-	},
-
-	// Injects recently queued functions to be first in line (after "inprogress")
-	unshift: function( element, queueLength, count ) {
-		var queue = element.queue();
-
-		if ( queueLength > 1 ) {
-			queue.splice.apply( queue,
-				[ 1, 0 ].concat( queue.splice( queueLength, count ) ) );
-		}
-		element.dequeue();
-	},
-
-	saveStyle: function( element ) {
-		element.data( dataSpaceStyle, element[ 0 ].style.cssText );
-	},
-
-	restoreStyle: function( element ) {
-		element[ 0 ].style.cssText = element.data( dataSpaceStyle ) || "";
-		element.removeData( dataSpaceStyle );
-	},
-
-	mode: function( element, mode ) {
-		var hidden = element.is( ":hidden" );
-
-		if ( mode === "toggle" ) {
-			mode = hidden ? "show" : "hide";
-		}
-		if ( hidden ? mode === "hide" : mode === "show" ) {
-			mode = "none";
-		}
-		return mode;
-	},
-
-	// Translates a [top,left] array into a baseline value
-	getBaseline: function( origin, original ) {
-		var y, x;
-
-		switch ( origin[ 0 ] ) {
-		case "top":
-			y = 0;
-			break;
-		case "middle":
-			y = 0.5;
-			break;
-		case "bottom":
-			y = 1;
-			break;
-		default:
-			y = origin[ 0 ] / original.height;
-		}
-
-		switch ( origin[ 1 ] ) {
-		case "left":
-			x = 0;
-			break;
-		case "center":
-			x = 0.5;
-			break;
-		case "right":
-			x = 1;
-			break;
-		default:
-			x = origin[ 1 ] / original.width;
-		}
-
-		return {
-			x: x,
-			y: y
-		};
-	},
-
-	// Creates a placeholder element so that the original element can be made absolute
-	createPlaceholder: function( element ) {
-		var placeholder,
-			cssPosition = element.css( "position" ),
-			position = element.position();
-
-		// Lock in margins first to account for form elements, which
-		// will change margin if you explicitly set height
-		// see: http://jsfiddle.net/JZSMt/3/ https://bugs.webkit.org/show_bug.cgi?id=107380
-		// Support: Safari
-		element.css( {
-			marginTop: element.css( "marginTop" ),
-			marginBottom: element.css( "marginBottom" ),
-			marginLeft: element.css( "marginLeft" ),
-			marginRight: element.css( "marginRight" )
-		} )
-		.outerWidth( element.outerWidth() )
-		.outerHeight( element.outerHeight() );
-
-		if ( /^(static|relative)/.test( cssPosition ) ) {
-			cssPosition = "absolute";
-
-			placeholder = $( "<" + element[ 0 ].nodeName + ">" ).insertAfter( element ).css( {
-
-				// Convert inline to inline block to account for inline elements
-				// that turn to inline block based on content (like img)
-				display: /^(inline|ruby)/.test( element.css( "display" ) ) ?
-					"inline-block" :
-					"block",
-				visibility: "hidden",
-
-				// Margins need to be set to account for margin collapse
-				marginTop: element.css( "marginTop" ),
-				marginBottom: element.css( "marginBottom" ),
-				marginLeft: element.css( "marginLeft" ),
-				marginRight: element.css( "marginRight" ),
-				"float": element.css( "float" )
-			} )
-			.outerWidth( element.outerWidth() )
-			.outerHeight( element.outerHeight() )
-			.addClass( "ui-effects-placeholder" );
-
-			element.data( dataSpace + "placeholder", placeholder );
-		}
-
-		element.css( {
-			position: cssPosition,
-			left: position.left,
-			top: position.top
-		} );
-
-		return placeholder;
-	},
-
-	removePlaceholder: function( element ) {
-		var dataKey = dataSpace + "placeholder",
-				placeholder = element.data( dataKey );
-
-		if ( placeholder ) {
-			placeholder.remove();
-			element.removeData( dataKey );
-		}
-	},
-
-	// Removes a placeholder if it exists and restores
-	// properties that were modified during placeholder creation
-	cleanUp: function( element ) {
-		$.effects.restoreStyle( element );
-		$.effects.removePlaceholder( element );
-	},
-
-	setTransition: function( element, list, factor, value ) {
-		value = value || {};
-		$.each( list, function( i, x ) {
-			var unit = element.cssUnit( x );
-			if ( unit[ 0 ] > 0 ) {
-				value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
-			}
-		} );
-		return value;
-	}
-} );
-
-// Return an effect options object for the given parameters:
-function _normalizeArguments( effect, options, speed, callback ) {
-
-	// Allow passing all options as the first parameter
-	if ( $.isPlainObject( effect ) ) {
-		options = effect;
-		effect = effect.effect;
-	}
-
-	// Convert to an object
-	effect = { effect: effect };
-
-	// Catch (effect, null, ...)
-	if ( options == null ) {
-		options = {};
-	}
-
-	// Catch (effect, callback)
-	if ( $.isFunction( options ) ) {
-		callback = options;
-		speed = null;
-		options = {};
-	}
-
-	// Catch (effect, speed, ?)
-	if ( typeof options === "number" || $.fx.speeds[ options ] ) {
-		callback = speed;
-		speed = options;
-		options = {};
-	}
-
-	// Catch (effect, options, callback)
-	if ( $.isFunction( speed ) ) {
-		callback = speed;
-		speed = null;
-	}
-
-	// Add options to effect
-	if ( options ) {
-		$.extend( effect, options );
-	}
-
-	speed = speed || options.duration;
-	effect.duration = $.fx.off ? 0 :
-		typeof speed === "number" ? speed :
-		speed in $.fx.speeds ? $.fx.speeds[ speed ] :
-		$.fx.speeds._default;
-
-	effect.complete = callback || options.complete;
-
-	return effect;
-}
-
-function standardAnimationOption( option ) {
-
-	// Valid standard speeds (nothing, number, named speed)
-	if ( !option || typeof option === "number" || $.fx.speeds[ option ] ) {
-		return true;
-	}
-
-	// Invalid strings - treat as "normal" speed
-	if ( typeof option === "string" && !$.effects.effect[ option ] ) {
-		return true;
-	}
-
-	// Complete callback
-	if ( $.isFunction( option ) ) {
-		return true;
-	}
-
-	// Options hash (but not naming an effect)
-	if ( typeof option === "object" && !option.effect ) {
-		return true;
-	}
-
-	// Didn't match any standard API
-	return false;
-}
-
-$.fn.extend( {
-	effect: function( /* effect, options, speed, callback */ ) {
-		var args = _normalizeArguments.apply( this, arguments ),
-			effectMethod = $.effects.effect[ args.effect ],
-			defaultMode = effectMethod.mode,
-			queue = args.queue,
-			queueName = queue || "fx",
-			complete = args.complete,
-			mode = args.mode,
-			modes = [],
-			prefilter = function( next ) {
-				var el = $( this ),
-					normalizedMode = $.effects.mode( el, mode ) || defaultMode;
-
-				// Sentinel for duck-punching the :animated psuedo-selector
-				el.data( dataSpaceAnimated, true );
-
-				// Save effect mode for later use,
-				// we can't just call $.effects.mode again later,
-				// as the .show() below destroys the initial state
-				modes.push( normalizedMode );
-
-				// See $.uiBackCompat inside of run() for removal of defaultMode in 1.13
-				if ( defaultMode && ( normalizedMode === "show" ||
-						( normalizedMode === defaultMode && normalizedMode === "hide" ) ) ) {
-					el.show();
-				}
-
-				if ( !defaultMode || normalizedMode !== "none" ) {
-					$.effects.saveStyle( el );
-				}
-
-				if ( $.isFunction( next ) ) {
-					next();
-				}
-			};
-
-		if ( $.fx.off || !effectMethod ) {
-
-			// Delegate to the original method (e.g., .show()) if possible
-			if ( mode ) {
-				return this[ mode ]( args.duration, complete );
-			} else {
-				return this.each( function() {
-					if ( complete ) {
-						complete.call( this );
-					}
-				} );
-			}
-		}
-
-		function run( next ) {
-			var elem = $( this );
-
-			function cleanup() {
-				elem.removeData( dataSpaceAnimated );
-
-				$.effects.cleanUp( elem );
-
-				if ( args.mode === "hide" ) {
-					elem.hide();
-				}
-
-				done();
-			}
-
-			function done() {
-				if ( $.isFunction( complete ) ) {
-					complete.call( elem[ 0 ] );
-				}
-
-				if ( $.isFunction( next ) ) {
-					next();
-				}
-			}
-
-			// Override mode option on a per element basis,
-			// as toggle can be either show or hide depending on element state
-			args.mode = modes.shift();
-
-			if ( $.uiBackCompat !== false && !defaultMode ) {
-				if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
-
-					// Call the core method to track "olddisplay" properly
-					elem[ mode ]();
-					done();
-				} else {
-					effectMethod.call( elem[ 0 ], args, done );
-				}
-			} else {
-				if ( args.mode === "none" ) {
-
-					// Call the core method to track "olddisplay" properly
-					elem[ mode ]();
-					done();
-				} else {
-					effectMethod.call( elem[ 0 ], args, cleanup );
-				}
-			}
-		}
-
-		// Run prefilter on all elements first to ensure that
-		// any showing or hiding happens before placeholder creation,
-		// which ensures that any layout changes are correctly captured.
-		return queue === false ?
-			this.each( prefilter ).each( run ) :
-			this.queue( queueName, prefilter ).queue( queueName, run );
-	},
-
-	show: ( function( orig ) {
-		return function( option ) {
-			if ( standardAnimationOption( option ) ) {
-				return orig.apply( this, arguments );
-			} else {
-				var args = _normalizeArguments.apply( this, arguments );
-				args.mode = "show";
-				return this.effect.call( this, args );
-			}
-		};
-	} )( $.fn.show ),
-
-	hide: ( function( orig ) {
-		return function( option ) {
-			if ( standardAnimationOption( option ) ) {
-				return orig.apply( this, arguments );
-			} else {
-				var args = _normalizeArguments.apply( this, arguments );
-				args.mode = "hide";
-				return this.effect.call( this, args );
-			}
-		};
-	} )( $.fn.hide ),
-
-	toggle: ( function( orig ) {
-		return function( option ) {
-			if ( standardAnimationOption( option ) || typeof option === "boolean" ) {
-				return orig.apply( this, arguments );
-			} else {
-				var args = _normalizeArguments.apply( this, arguments );
-				args.mode = "toggle";
-				return this.effect.call( this, args );
-			}
-		};
-	} )( $.fn.toggle ),
-
-	cssUnit: function( key ) {
-		var style = this.css( key ),
-			val = [];
-
-		$.each( [ "em", "px", "%", "pt" ], function( i, unit ) {
-			if ( style.indexOf( unit ) > 0 ) {
-				val = [ parseFloat( style ), unit ];
-			}
-		} );
-		return val;
-	},
-
-	cssClip: function( clipObj ) {
-		if ( clipObj ) {
-			return this.css( "clip", "rect(" + clipObj.top + "px " + clipObj.right + "px " +
-				clipObj.bottom + "px " + clipObj.left + "px)" );
-		}
-		return parseClip( this.css( "clip" ), this );
-	},
-
-	transfer: function( options, done ) {
-		var element = $( this ),
-			target = $( options.to ),
-			targetFixed = target.css( "position" ) === "fixed",
-			body = $( "body" ),
-			fixTop = targetFixed ? body.scrollTop() : 0,
-			fixLeft = targetFixed ? body.scrollLeft() : 0,
-			endPosition = target.offset(),
-			animation = {
-				top: endPosition.top - fixTop,
-				left: endPosition.left - fixLeft,
-				height: target.innerHeight(),
-				width: target.innerWidth()
-			},
-			startPosition = element.offset(),
-			transfer = $( "<div class='ui-effects-transfer'></div>" )
-				.appendTo( "body" )
-				.addClass( options.className )
-				.css( {
-					top: startPosition.top - fixTop,
-					left: startPosition.left - fixLeft,
-					height: element.innerHeight(),
-					width: element.innerWidth(),
-					position: targetFixed ? "fixed" : "absolute"
-				} )
-				.animate( animation, options.duration, options.easing, function() {
-					transfer.remove();
-					if ( $.isFunction( done ) ) {
-						done();
-					}
-				} );
-	}
-} );
-
-function parseClip( str, element ) {
-		var outerWidth = element.outerWidth(),
-			outerHeight = element.outerHeight(),
-			clipRegex = /^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,
-			values = clipRegex.exec( str ) || [ "", 0, outerWidth, outerHeight, 0 ];
-
-		return {
-			top: parseFloat( values[ 1 ] ) || 0,
-			right: values[ 2 ] === "auto" ? outerWidth : parseFloat( values[ 2 ] ),
-			bottom: values[ 3 ] === "auto" ? outerHeight : parseFloat( values[ 3 ] ),
-			left: parseFloat( values[ 4 ] ) || 0
-		};
-}
-
-$.fx.step.clip = function( fx ) {
-	if ( !fx.clipInit ) {
-		fx.start = $( fx.elem ).cssClip();
-		if ( typeof fx.end === "string" ) {
-			fx.end = parseClip( fx.end, fx.elem );
-		}
-		fx.clipInit = true;
-	}
-
-	$( fx.elem ).cssClip( {
-		top: fx.pos * ( fx.end.top - fx.start.top ) + fx.start.top,
-		right: fx.pos * ( fx.end.right - fx.start.right ) + fx.start.right,
-		bottom: fx.pos * ( fx.end.bottom - fx.start.bottom ) + fx.start.bottom,
-		left: fx.pos * ( fx.end.left - fx.start.left ) + fx.start.left
-	} );
-};
-
-} )();
-
-/******************************************************************************/
-/*********************************** EASING ***********************************/
-/******************************************************************************/
-
-( function() {
-
-// Based on easing equations from Robert Penner (http://www.robertpenner.com/easing)
-
-var baseEasings = {};
-
-$.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) {
-	baseEasings[ name ] = function( p ) {
-		return Math.pow( p, i + 2 );
-	};
-} );
-
-$.extend( baseEasings, {
-	Sine: function( p ) {
-		return 1 - Math.cos( p * Math.PI / 2 );
-	},
-	Circ: function( p ) {
-		return 1 - Math.sqrt( 1 - p * p );
-	},
-	Elastic: function( p ) {
-		return p === 0 || p === 1 ? p :
-			-Math.pow( 2, 8 * ( p - 1 ) ) * Math.sin( ( ( p - 1 ) * 80 - 7.5 ) * Math.PI / 15 );
-	},
-	Back: function( p ) {
-		return p * p * ( 3 * p - 2 );
-	},
-	Bounce: function( p ) {
-		var pow2,
-			bounce = 4;
-
-		while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
-		return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
-	}
-} );
-
-$.each( baseEasings, function( name, easeIn ) {
-	$.easing[ "easeIn" + name ] = easeIn;
-	$.easing[ "easeOut" + name ] = function( p ) {
-		return 1 - easeIn( 1 - p );
-	};
-	$.easing[ "easeInOut" + name ] = function( p ) {
-		return p < 0.5 ?
-			easeIn( p * 2 ) / 2 :
-			1 - easeIn( p * -2 + 2 ) / 2;
-	};
-} );
-
-} )();
-
-var effect = $.effects;
-
-
-/*!
- * jQuery UI Effects Blind 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Blind Effect
-//>>group: Effects
-//>>description: Blinds the element.
-//>>docs: http://api.jqueryui.com/blind-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectBlind = $.effects.define( "blind", "hide", function( options, done ) {
-	var map = {
-			up: [ "bottom", "top" ],
-			vertical: [ "bottom", "top" ],
-			down: [ "top", "bottom" ],
-			left: [ "right", "left" ],
-			horizontal: [ "right", "left" ],
-			right: [ "left", "right" ]
-		},
-		element = $( this ),
-		direction = options.direction || "up",
-		start = element.cssClip(),
-		animate = { clip: $.extend( {}, start ) },
-		placeholder = $.effects.createPlaceholder( element );
-
-	animate.clip[ map[ direction ][ 0 ] ] = animate.clip[ map[ direction ][ 1 ] ];
-
-	if ( options.mode === "show" ) {
-		element.cssClip( animate.clip );
-		if ( placeholder ) {
-			placeholder.css( $.effects.clipToBox( animate ) );
-		}
-
-		animate.clip = start;
-	}
-
-	if ( placeholder ) {
-		placeholder.animate( $.effects.clipToBox( animate ), options.duration, options.easing );
-	}
-
-	element.animate( animate, {
-		queue: false,
-		duration: options.duration,
-		easing: options.easing,
-		complete: done
-	} );
-} );
-
-
-/*!
- * jQuery UI Effects Bounce 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Bounce Effect
-//>>group: Effects
-//>>description: Bounces an element horizontally or vertically n times.
-//>>docs: http://api.jqueryui.com/bounce-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectBounce = $.effects.define( "bounce", function( options, done ) {
-	var upAnim, downAnim, refValue,
-		element = $( this ),
-
-		// Defaults:
-		mode = options.mode,
-		hide = mode === "hide",
-		show = mode === "show",
-		direction = options.direction || "up",
-		distance = options.distance,
-		times = options.times || 5,
-
-		// Number of internal animations
-		anims = times * 2 + ( show || hide ? 1 : 0 ),
-		speed = options.duration / anims,
-		easing = options.easing,
-
-		// Utility:
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		motion = ( direction === "up" || direction === "left" ),
-		i = 0,
-
-		queuelen = element.queue().length;
-
-	$.effects.createPlaceholder( element );
-
-	refValue = element.css( ref );
-
-	// Default distance for the BIGGEST bounce is the outer Distance / 3
-	if ( !distance ) {
-		distance = element[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3;
-	}
-
-	if ( show ) {
-		downAnim = { opacity: 1 };
-		downAnim[ ref ] = refValue;
-
-		// If we are showing, force opacity 0 and set the initial position
-		// then do the "first" animation
-		element
-			.css( "opacity", 0 )
-			.css( ref, motion ? -distance * 2 : distance * 2 )
-			.animate( downAnim, speed, easing );
-	}
-
-	// Start at the smallest distance if we are hiding
-	if ( hide ) {
-		distance = distance / Math.pow( 2, times - 1 );
-	}
-
-	downAnim = {};
-	downAnim[ ref ] = refValue;
-
-	// Bounces up/down/left/right then back to 0 -- times * 2 animations happen here
-	for ( ; i < times; i++ ) {
-		upAnim = {};
-		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
-
-		element
-			.animate( upAnim, speed, easing )
-			.animate( downAnim, speed, easing );
-
-		distance = hide ? distance * 2 : distance / 2;
-	}
-
-	// Last Bounce when Hiding
-	if ( hide ) {
-		upAnim = { opacity: 0 };
-		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
-
-		element.animate( upAnim, speed, easing );
-	}
-
-	element.queue( done );
-
-	$.effects.unshift( element, queuelen, anims + 1 );
-} );
-
-
-/*!
- * jQuery UI Effects Clip 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Clip Effect
-//>>group: Effects
-//>>description: Clips the element on and off like an old TV.
-//>>docs: http://api.jqueryui.com/clip-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectClip = $.effects.define( "clip", "hide", function( options, done ) {
-	var start,
-		animate = {},
-		element = $( this ),
-		direction = options.direction || "vertical",
-		both = direction === "both",
-		horizontal = both || direction === "horizontal",
-		vertical = both || direction === "vertical";
-
-	start = element.cssClip();
-	animate.clip = {
-		top: vertical ? ( start.bottom - start.top ) / 2 : start.top,
-		right: horizontal ? ( start.right - start.left ) / 2 : start.right,
-		bottom: vertical ? ( start.bottom - start.top ) / 2 : start.bottom,
-		left: horizontal ? ( start.right - start.left ) / 2 : start.left
-	};
-
-	$.effects.createPlaceholder( element );
-
-	if ( options.mode === "show" ) {
-		element.cssClip( animate.clip );
-		animate.clip = start;
-	}
-
-	element.animate( animate, {
-		queue: false,
-		duration: options.duration,
-		easing: options.easing,
-		complete: done
-	} );
-
-} );
-
-
-/*!
- * jQuery UI Effects Drop 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Drop Effect
-//>>group: Effects
-//>>description: Moves an element in one direction and hides it at the same time.
-//>>docs: http://api.jqueryui.com/drop-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectDrop = $.effects.define( "drop", "hide", function( options, done ) {
-
-	var distance,
-		element = $( this ),
-		mode = options.mode,
-		show = mode === "show",
-		direction = options.direction || "left",
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		motion = ( direction === "up" || direction === "left" ) ? "-=" : "+=",
-		oppositeMotion = ( motion === "+=" ) ? "-=" : "+=",
-		animation = {
-			opacity: 0
-		};
-
-	$.effects.createPlaceholder( element );
-
-	distance = options.distance ||
-		element[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ) / 2;
-
-	animation[ ref ] = motion + distance;
-
-	if ( show ) {
-		element.css( animation );
-
-		animation[ ref ] = oppositeMotion + distance;
-		animation.opacity = 1;
-	}
-
-	// Animate
-	element.animate( animation, {
-		queue: false,
-		duration: options.duration,
-		easing: options.easing,
-		complete: done
-	} );
-} );
-
-
-/*!
- * jQuery UI Effects Explode 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Explode Effect
-//>>group: Effects
-// jscs:disable maximumLineLength
-//>>description: Explodes an element in all directions into n pieces. Implodes an element to its original wholeness.
-// jscs:enable maximumLineLength
-//>>docs: http://api.jqueryui.com/explode-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectExplode = $.effects.define( "explode", "hide", function( options, done ) {
-
-	var i, j, left, top, mx, my,
-		rows = options.pieces ? Math.round( Math.sqrt( options.pieces ) ) : 3,
-		cells = rows,
-		element = $( this ),
-		mode = options.mode,
-		show = mode === "show",
-
-		// Show and then visibility:hidden the element before calculating offset
-		offset = element.show().css( "visibility", "hidden" ).offset(),
-
-		// Width and height of a piece
-		width = Math.ceil( element.outerWidth() / cells ),
-		height = Math.ceil( element.outerHeight() / rows ),
-		pieces = [];
-
-	// Children animate complete:
-	function childComplete() {
-		pieces.push( this );
-		if ( pieces.length === rows * cells ) {
-			animComplete();
-		}
-	}
-
-	// Clone the element for each row and cell.
-	for ( i = 0; i < rows; i++ ) { // ===>
-		top = offset.top + i * height;
-		my = i - ( rows - 1 ) / 2;
-
-		for ( j = 0; j < cells; j++ ) { // |||
-			left = offset.left + j * width;
-			mx = j - ( cells - 1 ) / 2;
-
-			// Create a clone of the now hidden main element that will be absolute positioned
-			// within a wrapper div off the -left and -top equal to size of our pieces
-			element
-				.clone()
-				.appendTo( "body" )
-				.wrap( "<div></div>" )
-				.css( {
-					position: "absolute",
-					visibility: "visible",
-					left: -j * width,
-					top: -i * height
-				} )
-
-				// Select the wrapper - make it overflow: hidden and absolute positioned based on
-				// where the original was located +left and +top equal to the size of pieces
-				.parent()
-					.addClass( "ui-effects-explode" )
-					.css( {
-						position: "absolute",
-						overflow: "hidden",
-						width: width,
-						height: height,
-						left: left + ( show ? mx * width : 0 ),
-						top: top + ( show ? my * height : 0 ),
-						opacity: show ? 0 : 1
-					} )
-					.animate( {
-						left: left + ( show ? 0 : mx * width ),
-						top: top + ( show ? 0 : my * height ),
-						opacity: show ? 1 : 0
-					}, options.duration || 500, options.easing, childComplete );
-		}
-	}
-
-	function animComplete() {
-		element.css( {
-			visibility: "visible"
-		} );
-		$( pieces ).remove();
-		done();
-	}
-} );
-
-
-/*!
- * jQuery UI Effects Fade 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Fade Effect
-//>>group: Effects
-//>>description: Fades the element.
-//>>docs: http://api.jqueryui.com/fade-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectFade = $.effects.define( "fade", "toggle", function( options, done ) {
-	var show = options.mode === "show";
-
-	$( this )
-		.css( "opacity", show ? 0 : 1 )
-		.animate( {
-			opacity: show ? 1 : 0
-		}, {
-			queue: false,
-			duration: options.duration,
-			easing: options.easing,
-			complete: done
-		} );
-} );
-
-
-/*!
- * jQuery UI Effects Fold 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Fold Effect
-//>>group: Effects
-//>>description: Folds an element first horizontally and then vertically.
-//>>docs: http://api.jqueryui.com/fold-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectFold = $.effects.define( "fold", "hide", function( options, done ) {
-
-	// Create element
-	var element = $( this ),
-		mode = options.mode,
-		show = mode === "show",
-		hide = mode === "hide",
-		size = options.size || 15,
-		percent = /([0-9]+)%/.exec( size ),
-		horizFirst = !!options.horizFirst,
-		ref = horizFirst ? [ "right", "bottom" ] : [ "bottom", "right" ],
-		duration = options.duration / 2,
-
-		placeholder = $.effects.createPlaceholder( element ),
-
-		start = element.cssClip(),
-		animation1 = { clip: $.extend( {}, start ) },
-		animation2 = { clip: $.extend( {}, start ) },
-
-		distance = [ start[ ref[ 0 ] ], start[ ref[ 1 ] ] ],
-
-		queuelen = element.queue().length;
-
-	if ( percent ) {
-		size = parseInt( percent[ 1 ], 10 ) / 100 * distance[ hide ? 0 : 1 ];
-	}
-	animation1.clip[ ref[ 0 ] ] = size;
-	animation2.clip[ ref[ 0 ] ] = size;
-	animation2.clip[ ref[ 1 ] ] = 0;
-
-	if ( show ) {
-		element.cssClip( animation2.clip );
-		if ( placeholder ) {
-			placeholder.css( $.effects.clipToBox( animation2 ) );
-		}
-
-		animation2.clip = start;
-	}
-
-	// Animate
-	element
-		.queue( function( next ) {
-			if ( placeholder ) {
-				placeholder
-					.animate( $.effects.clipToBox( animation1 ), duration, options.easing )
-					.animate( $.effects.clipToBox( animation2 ), duration, options.easing );
-			}
-
-			next();
-		} )
-		.animate( animation1, duration, options.easing )
-		.animate( animation2, duration, options.easing )
-		.queue( done );
-
-	$.effects.unshift( element, queuelen, 4 );
-} );
-
-
-/*!
- * jQuery UI Effects Highlight 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Highlight Effect
-//>>group: Effects
-//>>description: Highlights the background of an element in a defined color for a custom duration.
-//>>docs: http://api.jqueryui.com/highlight-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectHighlight = $.effects.define( "highlight", "show", function( options, done ) {
-	var element = $( this ),
-		animation = {
-			backgroundColor: element.css( "backgroundColor" )
-		};
-
-	if ( options.mode === "hide" ) {
-		animation.opacity = 0;
-	}
-
-	$.effects.saveStyle( element );
-
-	element
-		.css( {
-			backgroundImage: "none",
-			backgroundColor: options.color || "#ffff99"
-		} )
-		.animate( animation, {
-			queue: false,
-			duration: options.duration,
-			easing: options.easing,
-			complete: done
-		} );
-} );
-
-
-/*!
- * jQuery UI Effects Size 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Size Effect
-//>>group: Effects
-//>>description: Resize an element to a specified width and height.
-//>>docs: http://api.jqueryui.com/size-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectSize = $.effects.define( "size", function( options, done ) {
-
-	// Create element
-	var baseline, factor, temp,
-		element = $( this ),
-
-		// Copy for children
-		cProps = [ "fontSize" ],
-		vProps = [ "borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom" ],
-		hProps = [ "borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight" ],
-
-		// Set options
-		mode = options.mode,
-		restore = mode !== "effect",
-		scale = options.scale || "both",
-		origin = options.origin || [ "middle", "center" ],
-		position = element.css( "position" ),
-		pos = element.position(),
-		original = $.effects.scaledDimensions( element ),
-		from = options.from || original,
-		to = options.to || $.effects.scaledDimensions( element, 0 );
-
-	$.effects.createPlaceholder( element );
-
-	if ( mode === "show" ) {
-		temp = from;
-		from = to;
-		to = temp;
-	}
-
-	// Set scaling factor
-	factor = {
-		from: {
-			y: from.height / original.height,
-			x: from.width / original.width
-		},
-		to: {
-			y: to.height / original.height,
-			x: to.width / original.width
-		}
-	};
-
-	// Scale the css box
-	if ( scale === "box" || scale === "both" ) {
-
-		// Vertical props scaling
-		if ( factor.from.y !== factor.to.y ) {
-			from = $.effects.setTransition( element, vProps, factor.from.y, from );
-			to = $.effects.setTransition( element, vProps, factor.to.y, to );
-		}
-
-		// Horizontal props scaling
-		if ( factor.from.x !== factor.to.x ) {
-			from = $.effects.setTransition( element, hProps, factor.from.x, from );
-			to = $.effects.setTransition( element, hProps, factor.to.x, to );
-		}
-	}
-
-	// Scale the content
-	if ( scale === "content" || scale === "both" ) {
-
-		// Vertical props scaling
-		if ( factor.from.y !== factor.to.y ) {
-			from = $.effects.setTransition( element, cProps, factor.from.y, from );
-			to = $.effects.setTransition( element, cProps, factor.to.y, to );
-		}
-	}
-
-	// Adjust the position properties based on the provided origin points
-	if ( origin ) {
-		baseline = $.effects.getBaseline( origin, original );
-		from.top = ( original.outerHeight - from.outerHeight ) * baseline.y + pos.top;
-		from.left = ( original.outerWidth - from.outerWidth ) * baseline.x + pos.left;
-		to.top = ( original.outerHeight - to.outerHeight ) * baseline.y + pos.top;
-		to.left = ( original.outerWidth - to.outerWidth ) * baseline.x + pos.left;
-	}
-	element.css( from );
-
-	// Animate the children if desired
-	if ( scale === "content" || scale === "both" ) {
-
-		vProps = vProps.concat( [ "marginTop", "marginBottom" ] ).concat( cProps );
-		hProps = hProps.concat( [ "marginLeft", "marginRight" ] );
-
-		// Only animate children with width attributes specified
-		// TODO: is this right? should we include anything with css width specified as well
-		element.find( "*[width]" ).each( function() {
-			var child = $( this ),
-				childOriginal = $.effects.scaledDimensions( child ),
-				childFrom = {
-					height: childOriginal.height * factor.from.y,
-					width: childOriginal.width * factor.from.x,
-					outerHeight: childOriginal.outerHeight * factor.from.y,
-					outerWidth: childOriginal.outerWidth * factor.from.x
-				},
-				childTo = {
-					height: childOriginal.height * factor.to.y,
-					width: childOriginal.width * factor.to.x,
-					outerHeight: childOriginal.height * factor.to.y,
-					outerWidth: childOriginal.width * factor.to.x
-				};
-
-			// Vertical props scaling
-			if ( factor.from.y !== factor.to.y ) {
-				childFrom = $.effects.setTransition( child, vProps, factor.from.y, childFrom );
-				childTo = $.effects.setTransition( child, vProps, factor.to.y, childTo );
-			}
-
-			// Horizontal props scaling
-			if ( factor.from.x !== factor.to.x ) {
-				childFrom = $.effects.setTransition( child, hProps, factor.from.x, childFrom );
-				childTo = $.effects.setTransition( child, hProps, factor.to.x, childTo );
-			}
-
-			if ( restore ) {
-				$.effects.saveStyle( child );
-			}
-
-			// Animate children
-			child.css( childFrom );
-			child.animate( childTo, options.duration, options.easing, function() {
-
-				// Restore children
-				if ( restore ) {
-					$.effects.restoreStyle( child );
-				}
-			} );
-		} );
-	}
-
-	// Animate
-	element.animate( to, {
-		queue: false,
-		duration: options.duration,
-		easing: options.easing,
-		complete: function() {
-
-			var offset = element.offset();
-
-			if ( to.opacity === 0 ) {
-				element.css( "opacity", from.opacity );
-			}
-
-			if ( !restore ) {
-				element
-					.css( "position", position === "static" ? "relative" : position )
-					.offset( offset );
-
-				// Need to save style here so that automatic style restoration
-				// doesn't restore to the original styles from before the animation.
-				$.effects.saveStyle( element );
-			}
-
-			done();
-		}
-	} );
-
-} );
-
-
-/*!
- * jQuery UI Effects Scale 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Scale Effect
-//>>group: Effects
-//>>description: Grows or shrinks an element and its content.
-//>>docs: http://api.jqueryui.com/scale-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectScale = $.effects.define( "scale", function( options, done ) {
-
-	// Create element
-	var el = $( this ),
-		mode = options.mode,
-		percent = parseInt( options.percent, 10 ) ||
-			( parseInt( options.percent, 10 ) === 0 ? 0 : ( mode !== "effect" ? 0 : 100 ) ),
-
-		newOptions = $.extend( true, {
-			from: $.effects.scaledDimensions( el ),
-			to: $.effects.scaledDimensions( el, percent, options.direction || "both" ),
-			origin: options.origin || [ "middle", "center" ]
-		}, options );
-
-	// Fade option to support puff
-	if ( options.fade ) {
-		newOptions.from.opacity = 1;
-		newOptions.to.opacity = 0;
-	}
-
-	$.effects.effect.size.call( this, newOptions, done );
-} );
-
-
-/*!
- * jQuery UI Effects Puff 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Puff Effect
-//>>group: Effects
-//>>description: Creates a puff effect by scaling the element up and hiding it at the same time.
-//>>docs: http://api.jqueryui.com/puff-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectPuff = $.effects.define( "puff", "hide", function( options, done ) {
-	var newOptions = $.extend( true, {}, options, {
-		fade: true,
-		percent: parseInt( options.percent, 10 ) || 150
-	} );
-
-	$.effects.effect.scale.call( this, newOptions, done );
-} );
-
-
-/*!
- * jQuery UI Effects Pulsate 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Pulsate Effect
-//>>group: Effects
-//>>description: Pulsates an element n times by changing the opacity to zero and back.
-//>>docs: http://api.jqueryui.com/pulsate-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectPulsate = $.effects.define( "pulsate", "show", function( options, done ) {
-	var element = $( this ),
-		mode = options.mode,
-		show = mode === "show",
-		hide = mode === "hide",
-		showhide = show || hide,
-
-		// Showing or hiding leaves off the "last" animation
-		anims = ( ( options.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
-		duration = options.duration / anims,
-		animateTo = 0,
-		i = 1,
-		queuelen = element.queue().length;
-
-	if ( show || !element.is( ":visible" ) ) {
-		element.css( "opacity", 0 ).show();
-		animateTo = 1;
-	}
-
-	// Anims - 1 opacity "toggles"
-	for ( ; i < anims; i++ ) {
-		element.animate( { opacity: animateTo }, duration, options.easing );
-		animateTo = 1 - animateTo;
-	}
-
-	element.animate( { opacity: animateTo }, duration, options.easing );
-
-	element.queue( done );
-
-	$.effects.unshift( element, queuelen, anims + 1 );
-} );
-
-
-/*!
- * jQuery UI Effects Shake 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Shake Effect
-//>>group: Effects
-//>>description: Shakes an element horizontally or vertically n times.
-//>>docs: http://api.jqueryui.com/shake-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectShake = $.effects.define( "shake", function( options, done ) {
-
-	var i = 1,
-		element = $( this ),
-		direction = options.direction || "left",
-		distance = options.distance || 20,
-		times = options.times || 3,
-		anims = times * 2 + 1,
-		speed = Math.round( options.duration / anims ),
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		positiveMotion = ( direction === "up" || direction === "left" ),
-		animation = {},
-		animation1 = {},
-		animation2 = {},
-
-		queuelen = element.queue().length;
-
-	$.effects.createPlaceholder( element );
-
-	// Animation
-	animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance;
-	animation1[ ref ] = ( positiveMotion ? "+=" : "-=" ) + distance * 2;
-	animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2;
-
-	// Animate
-	element.animate( animation, speed, options.easing );
-
-	// Shakes
-	for ( ; i < times; i++ ) {
-		element
-			.animate( animation1, speed, options.easing )
-			.animate( animation2, speed, options.easing );
-	}
-
-	element
-		.animate( animation1, speed, options.easing )
-		.animate( animation, speed / 2, options.easing )
-		.queue( done );
-
-	$.effects.unshift( element, queuelen, anims + 1 );
-} );
-
-
-/*!
- * jQuery UI Effects Slide 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Slide Effect
-//>>group: Effects
-//>>description: Slides an element in and out of the viewport.
-//>>docs: http://api.jqueryui.com/slide-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectSlide = $.effects.define( "slide", "show", function( options, done ) {
-	var startClip, startRef,
-		element = $( this ),
-		map = {
-			up: [ "bottom", "top" ],
-			down: [ "top", "bottom" ],
-			left: [ "right", "left" ],
-			right: [ "left", "right" ]
-		},
-		mode = options.mode,
-		direction = options.direction || "left",
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		positiveMotion = ( direction === "up" || direction === "left" ),
-		distance = options.distance ||
-			element[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ),
-		animation = {};
-
-	$.effects.createPlaceholder( element );
-
-	startClip = element.cssClip();
-	startRef = element.position()[ ref ];
-
-	// Define hide animation
-	animation[ ref ] = ( positiveMotion ? -1 : 1 ) * distance + startRef;
-	animation.clip = element.cssClip();
-	animation.clip[ map[ direction ][ 1 ] ] = animation.clip[ map[ direction ][ 0 ] ];
-
-	// Reverse the animation if we're showing
-	if ( mode === "show" ) {
-		element.cssClip( animation.clip );
-		element.css( ref, animation[ ref ] );
-		animation.clip = startClip;
-		animation[ ref ] = startRef;
-	}
-
-	// Actually animate
-	element.animate( animation, {
-		queue: false,
-		duration: options.duration,
-		easing: options.easing,
-		complete: done
-	} );
-} );
-
-
-/*!
- * jQuery UI Effects Transfer 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Transfer Effect
-//>>group: Effects
-//>>description: Displays a transfer effect from one element to another.
-//>>docs: http://api.jqueryui.com/transfer-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effect;
-if ( $.uiBackCompat !== false ) {
-	effect = $.effects.define( "transfer", function( options, done ) {
-		$( this ).transfer( options, done );
-	} );
-}
-var effectsEffectTransfer = effect;
-
-
-/*!
- * jQuery UI Focusable 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: :focusable Selector
-//>>group: Core
-//>>description: Selects elements which can be focused.
-//>>docs: http://api.jqueryui.com/focusable-selector/
-
-
-
-// Selectors
-$.ui.focusable = function( element, hasTabindex ) {
-	var map, mapName, img, focusableIfVisible, fieldset,
-		nodeName = element.nodeName.toLowerCase();
-
-	if ( "area" === nodeName ) {
-		map = element.parentNode;
-		mapName = map.name;
-		if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
-			return false;
-		}
-		img = $( "img[usemap='#" + mapName + "']" );
-		return img.length > 0 && img.is( ":visible" );
-	}
-
-	if ( /^(input|select|textarea|button|object)$/.test( nodeName ) ) {
-		focusableIfVisible = !element.disabled;
-
-		if ( focusableIfVisible ) {
-
-			// Form controls within a disabled fieldset are disabled.
-			// However, controls within the fieldset's legend do not get disabled.
-			// Since controls generally aren't placed inside legends, we skip
-			// this portion of the check.
-			fieldset = $( element ).closest( "fieldset" )[ 0 ];
-			if ( fieldset ) {
-				focusableIfVisible = !fieldset.disabled;
-			}
-		}
-	} else if ( "a" === nodeName ) {
-		focusableIfVisible = element.href || hasTabindex;
-	} else {
-		focusableIfVisible = hasTabindex;
-	}
-
-	return focusableIfVisible && $( element ).is( ":visible" ) && visible( $( element ) );
-};
-
-// Support: IE 8 only
-// IE 8 doesn't resolve inherit to visible/hidden for computed values
-function visible( element ) {
-	var visibility = element.css( "visibility" );
-	while ( visibility === "inherit" ) {
-		element = element.parent();
-		visibility = element.css( "visibility" );
-	}
-	return visibility !== "hidden";
-}
-
-$.extend( $.expr[ ":" ], {
-	focusable: function( element ) {
-		return $.ui.focusable( element, $.attr( element, "tabindex" ) != null );
-	}
-} );
-
-var focusable = $.ui.focusable;
-
-
-
-
-// Support: IE8 Only
-// IE8 does not support the form attribute and when it is supplied. It overwrites the form prop
-// with a string, so we need to find the proper form.
-var form = $.fn.form = function() {
-	return typeof this[ 0 ].form === "string" ? this.closest( "form" ) : $( this[ 0 ].form );
-};
-
-
-/*!
- * jQuery UI Form Reset Mixin 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Form Reset Mixin
-//>>group: Core
-//>>description: Refresh input widgets when their form is reset
-//>>docs: http://api.jqueryui.com/form-reset-mixin/
-
-
-
-var formResetMixin = $.ui.formResetMixin = {
-	_formResetHandler: function() {
-		var form = $( this );
-
-		// Wait for the form reset to actually happen before refreshing
-		setTimeout( function() {
-			var instances = form.data( "ui-form-reset-instances" );
-			$.each( instances, function() {
-				this.refresh();
-			} );
-		} );
-	},
-
-	_bindFormResetHandler: function() {
-		this.form = this.element.form();
-		if ( !this.form.length ) {
-			return;
-		}
-
-		var instances = this.form.data( "ui-form-reset-instances" ) || [];
-		if ( !instances.length ) {
-
-			// We don't use _on() here because we use a single event handler per form
-			this.form.on( "reset.ui-form-reset", this._formResetHandler );
-		}
-		instances.push( this );
-		this.form.data( "ui-form-reset-instances", instances );
-	},
-
-	_unbindFormResetHandler: function() {
-		if ( !this.form.length ) {
-			return;
-		}
-
-		var instances = this.form.data( "ui-form-reset-instances" );
-		instances.splice( $.inArray( this, instances ), 1 );
-		if ( instances.length ) {
-			this.form.data( "ui-form-reset-instances", instances );
-		} else {
-			this.form
-				.removeData( "ui-form-reset-instances" )
-				.off( "reset.ui-form-reset" );
-		}
-	}
-};
-
-
-/*!
- * jQuery UI Support for jQuery core 1.7.x 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- */
-
-//>>label: jQuery 1.7 Support
-//>>group: Core
-//>>description: Support version 1.7.x of jQuery core
-
-
-
-// Support: jQuery 1.7 only
-// Not a great way to check versions, but since we only support 1.7+ and only
-// need to detect <1.8, this is a simple check that should suffice. Checking
-// for "1.7." would be a bit safer, but the version string is 1.7, not 1.7.0
-// and we'll never reach 1.70.0 (if we do, we certainly won't be supporting
-// 1.7 anymore). See #11197 for why we're not using feature detection.
-if ( $.fn.jquery.substring( 0, 3 ) === "1.7" ) {
-
-	// Setters for .innerWidth(), .innerHeight(), .outerWidth(), .outerHeight()
-	// Unlike jQuery Core 1.8+, these only support numeric values to set the
-	// dimensions in pixels
-	$.each( [ "Width", "Height" ], function( i, name ) {
-		var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
-			type = name.toLowerCase(),
-			orig = {
-				innerWidth: $.fn.innerWidth,
-				innerHeight: $.fn.innerHeight,
-				outerWidth: $.fn.outerWidth,
-				outerHeight: $.fn.outerHeight
-			};
-
-		function reduce( elem, size, border, margin ) {
-			$.each( side, function() {
-				size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
-				if ( border ) {
-					size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
-				}
-				if ( margin ) {
-					size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
-				}
-			} );
-			return size;
-		}
-
-		$.fn[ "inner" + name ] = function( size ) {
-			if ( size === undefined ) {
-				return orig[ "inner" + name ].call( this );
-			}
-
-			return this.each( function() {
-				$( this ).css( type, reduce( this, size ) + "px" );
-			} );
-		};
-
-		$.fn[ "outer" + name ] = function( size, margin ) {
-			if ( typeof size !== "number" ) {
-				return orig[ "outer" + name ].call( this, size );
-			}
-
-			return this.each( function() {
-				$( this ).css( type, reduce( this, size, true, margin ) + "px" );
-			} );
-		};
-	} );
-
-	$.fn.addBack = function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
-	};
-}
-
-;
-/*!
- * jQuery UI Keycode 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Keycode
-//>>group: Core
-//>>description: Provide keycodes as keynames
-//>>docs: http://api.jqueryui.com/jQuery.ui.keyCode/
-
-
-var keycode = $.ui.keyCode = {
-	BACKSPACE: 8,
-	COMMA: 188,
-	DELETE: 46,
-	DOWN: 40,
-	END: 35,
-	ENTER: 13,
-	ESCAPE: 27,
-	HOME: 36,
-	LEFT: 37,
-	PAGE_DOWN: 34,
-	PAGE_UP: 33,
-	PERIOD: 190,
-	RIGHT: 39,
-	SPACE: 32,
-	TAB: 9,
-	UP: 38
-};
-
-
-
-
-// Internal use only
-var escapeSelector = $.ui.escapeSelector = ( function() {
-	var selectorEscape = /([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g;
-	return function( selector ) {
-		return selector.replace( selectorEscape, "\\$1" );
-	};
-} )();
-
-
-/*!
- * jQuery UI Labels 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: labels
-//>>group: Core
-//>>description: Find all the labels associated with a given input
-//>>docs: http://api.jqueryui.com/labels/
-
-
-
-var labels = $.fn.labels = function() {
-	var ancestor, selector, id, labels, ancestors;
-
-	// Check control.labels first
-	if ( this[ 0 ].labels && this[ 0 ].labels.length ) {
-		return this.pushStack( this[ 0 ].labels );
-	}
-
-	// Support: IE <= 11, FF <= 37, Android <= 2.3 only
-	// Above browsers do not support control.labels. Everything below is to support them
-	// as well as document fragments. control.labels does not work on document fragments
-	labels = this.eq( 0 ).parents( "label" );
-
-	// Look for the label based on the id
-	id = this.attr( "id" );
-	if ( id ) {
-
-		// We don't search against the document in case the element
-		// is disconnected from the DOM
-		ancestor = this.eq( 0 ).parents().last();
-
-		// Get a full set of top level ancestors
-		ancestors = ancestor.add( ancestor.length ? ancestor.siblings() : this.siblings() );
-
-		// Create a selector for the label based on the id
-		selector = "label[for='" + $.ui.escapeSelector( id ) + "']";
-
-		labels = labels.add( ancestors.find( selector ).addBack( selector ) );
-
-	}
-
-	// Return whatever we have found for labels
-	return this.pushStack( labels );
-};
-
-
-/*!
- * jQuery UI Scroll Parent 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: scrollParent
-//>>group: Core
-//>>description: Get the closest ancestor element that is scrollable.
-//>>docs: http://api.jqueryui.com/scrollParent/
-
-
-
-var scrollParent = $.fn.scrollParent = function( includeHidden ) {
-	var position = this.css( "position" ),
-		excludeStaticParent = position === "absolute",
-		overflowRegex = includeHidden ? /(auto|scroll|hidden)/ : /(auto|scroll)/,
-		scrollParent = this.parents().filter( function() {
-			var parent = $( this );
-			if ( excludeStaticParent && parent.css( "position" ) === "static" ) {
-				return false;
-			}
-			return overflowRegex.test( parent.css( "overflow" ) + parent.css( "overflow-y" ) +
-				parent.css( "overflow-x" ) );
-		} ).eq( 0 );
-
-	return position === "fixed" || !scrollParent.length ?
-		$( this[ 0 ].ownerDocument || document ) :
-		scrollParent;
-};
-
-
-/*!
- * jQuery UI Tabbable 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: :tabbable Selector
-//>>group: Core
-//>>description: Selects elements which can be tabbed to.
-//>>docs: http://api.jqueryui.com/tabbable-selector/
-
-
-
-var tabbable = $.extend( $.expr[ ":" ], {
-	tabbable: function( element ) {
-		var tabIndex = $.attr( element, "tabindex" ),
-			hasTabindex = tabIndex != null;
-		return ( !hasTabindex || tabIndex >= 0 ) && $.ui.focusable( element, hasTabindex );
-	}
-} );
-
-
-/*!
- * jQuery UI Unique ID 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: uniqueId
-//>>group: Core
-//>>description: Functions to generate and remove uniqueId's
-//>>docs: http://api.jqueryui.com/uniqueId/
-
-
-
-var uniqueId = $.fn.extend( {
-	uniqueId: ( function() {
-		var uuid = 0;
-
-		return function() {
-			return this.each( function() {
-				if ( !this.id ) {
-					this.id = "ui-id-" + ( ++uuid );
-				}
-			} );
-		};
-	} )(),
-
-	removeUniqueId: function() {
-		return this.each( function() {
-			if ( /^ui-id-\d+$/.test( this.id ) ) {
-				$( this ).removeAttr( "id" );
-			}
-		} );
-	}
-} );
-
-
-/*!
- * jQuery UI Accordion 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Accordion
-//>>group: Widgets
-// jscs:disable maximumLineLength
-//>>description: Displays collapsible content panels for presenting information in a limited amount of space.
-// jscs:enable maximumLineLength
-//>>docs: http://api.jqueryui.com/accordion/
-//>>demos: http://jqueryui.com/accordion/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/accordion.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-var widgetsAccordion = $.widget( "ui.accordion", {
-	version: "1.12.1",
-	options: {
-		active: 0,
-		animate: {},
-		classes: {
-			"ui-accordion-header": "ui-corner-top",
-			"ui-accordion-header-collapsed": "ui-corner-all",
-			"ui-accordion-content": "ui-corner-bottom"
-		},
-		collapsible: false,
-		event: "click",
-		header: "> li > :first-child, > :not(li):even",
-		heightStyle: "auto",
-		icons: {
-			activeHeader: "ui-icon-triangle-1-s",
-			header: "ui-icon-triangle-1-e"
-		},
-
-		// Callbacks
-		activate: null,
-		beforeActivate: null
-	},
-
-	hideProps: {
-		borderTopWidth: "hide",
-		borderBottomWidth: "hide",
-		paddingTop: "hide",
-		paddingBottom: "hide",
-		height: "hide"
-	},
-
-	showProps: {
-		borderTopWidth: "show",
-		borderBottomWidth: "show",
-		paddingTop: "show",
-		paddingBottom: "show",
-		height: "show"
-	},
-
-	_create: function() {
-		var options = this.options;
-
-		this.prevShow = this.prevHide = $();
-		this._addClass( "ui-accordion", "ui-widget ui-helper-reset" );
-		this.element.attr( "role", "tablist" );
-
-		// Don't allow collapsible: false and active: false / null
-		if ( !options.collapsible && ( options.active === false || options.active == null ) ) {
-			options.active = 0;
-		}
-
-		this._processPanels();
-
-		// handle negative values
-		if ( options.active < 0 ) {
-			options.active += this.headers.length;
-		}
-		this._refresh();
-	},
-
-	_getCreateEventData: function() {
-		return {
-			header: this.active,
-			panel: !this.active.length ? $() : this.active.next()
-		};
-	},
-
-	_createIcons: function() {
-		var icon, children,
-			icons = this.options.icons;
-
-		if ( icons ) {
-			icon = $( "<span>" );
-			this._addClass( icon, "ui-accordion-header-icon", "ui-icon " + icons.header );
-			icon.prependTo( this.headers );
-			children = this.active.children( ".ui-accordion-header-icon" );
-			this._removeClass( children, icons.header )
-				._addClass( children, null, icons.activeHeader )
-				._addClass( this.headers, "ui-accordion-icons" );
-		}
-	},
-
-	_destroyIcons: function() {
-		this._removeClass( this.headers, "ui-accordion-icons" );
-		this.headers.children( ".ui-accordion-header-icon" ).remove();
-	},
-
-	_destroy: function() {
-		var contents;
-
-		// Clean up main element
-		this.element.removeAttr( "role" );
-
-		// Clean up headers
-		this.headers
-			.removeAttr( "role aria-expanded aria-selected aria-controls tabIndex" )
-			.removeUniqueId();
-
-		this._destroyIcons();
-
-		// Clean up content panels
-		contents = this.headers.next()
-			.css( "display", "" )
-			.removeAttr( "role aria-hidden aria-labelledby" )
-			.removeUniqueId();
-
-		if ( this.options.heightStyle !== "content" ) {
-			contents.css( "height", "" );
-		}
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "active" ) {
-
-			// _activate() will handle invalid values and update this.options
-			this._activate( value );
-			return;
-		}
-
-		if ( key === "event" ) {
-			if ( this.options.event ) {
-				this._off( this.headers, this.options.event );
-			}
-			this._setupEvents( value );
-		}
-
-		this._super( key, value );
-
-		// Setting collapsible: false while collapsed; open first panel
-		if ( key === "collapsible" && !value && this.options.active === false ) {
-			this._activate( 0 );
-		}
-
-		if ( key === "icons" ) {
-			this._destroyIcons();
-			if ( value ) {
-				this._createIcons();
-			}
-		}
-	},
-
-	_setOptionDisabled: function( value ) {
-		this._super( value );
-
-		this.element.attr( "aria-disabled", value );
-
-		// Support: IE8 Only
-		// #5332 / #6059 - opacity doesn't cascade to positioned elements in IE
-		// so we need to add the disabled class to the headers and panels
-		this._toggleClass( null, "ui-state-disabled", !!value );
-		this._toggleClass( this.headers.add( this.headers.next() ), null, "ui-state-disabled",
-			!!value );
-	},
-
-	_keydown: function( event ) {
-		if ( event.altKey || event.ctrlKey ) {
-			return;
-		}
-
-		var keyCode = $.ui.keyCode,
-			length = this.headers.length,
-			currentIndex = this.headers.index( event.target ),
-			toFocus = false;
-
-		switch ( event.keyCode ) {
-		case keyCode.RIGHT:
-		case keyCode.DOWN:
-			toFocus = this.headers[ ( currentIndex + 1 ) % length ];
-			break;
-		case keyCode.LEFT:
-		case keyCode.UP:
-			toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
-			break;
-		case keyCode.SPACE:
-		case keyCode.ENTER:
-			this._eventHandler( event );
-			break;
-		case keyCode.HOME:
-			toFocus = this.headers[ 0 ];
-			break;
-		case keyCode.END:
-			toFocus = this.headers[ length - 1 ];
-			break;
-		}
-
-		if ( toFocus ) {
-			$( event.target ).attr( "tabIndex", -1 );
-			$( toFocus ).attr( "tabIndex", 0 );
-			$( toFocus ).trigger( "focus" );
-			event.preventDefault();
-		}
-	},
-
-	_panelKeyDown: function( event ) {
-		if ( event.keyCode === $.ui.keyCode.UP && event.ctrlKey ) {
-			$( event.currentTarget ).prev().trigger( "focus" );
-		}
-	},
-
-	refresh: function() {
-		var options = this.options;
-		this._processPanels();
-
-		// Was collapsed or no panel
-		if ( ( options.active === false && options.collapsible === true ) ||
-				!this.headers.length ) {
-			options.active = false;
-			this.active = $();
-
-		// active false only when collapsible is true
-		} else if ( options.active === false ) {
-			this._activate( 0 );
-
-		// was active, but active panel is gone
-		} else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
-
-			// all remaining panel are disabled
-			if ( this.headers.length === this.headers.find( ".ui-state-disabled" ).length ) {
-				options.active = false;
-				this.active = $();
-
-			// activate previous panel
-			} else {
-				this._activate( Math.max( 0, options.active - 1 ) );
-			}
-
-		// was active, active panel still exists
-		} else {
-
-			// make sure active index is correct
-			options.active = this.headers.index( this.active );
-		}
-
-		this._destroyIcons();
-
-		this._refresh();
-	},
-
-	_processPanels: function() {
-		var prevHeaders = this.headers,
-			prevPanels = this.panels;
-
-		this.headers = this.element.find( this.options.header );
-		this._addClass( this.headers, "ui-accordion-header ui-accordion-header-collapsed",
-			"ui-state-default" );
-
-		this.panels = this.headers.next().filter( ":not(.ui-accordion-content-active)" ).hide();
-		this._addClass( this.panels, "ui-accordion-content", "ui-helper-reset ui-widget-content" );
-
-		// Avoid memory leaks (#10056)
-		if ( prevPanels ) {
-			this._off( prevHeaders.not( this.headers ) );
-			this._off( prevPanels.not( this.panels ) );
-		}
-	},
-
-	_refresh: function() {
-		var maxHeight,
-			options = this.options,
-			heightStyle = options.heightStyle,
-			parent = this.element.parent();
-
-		this.active = this._findActive( options.active );
-		this._addClass( this.active, "ui-accordion-header-active", "ui-state-active" )
-			._removeClass( this.active, "ui-accordion-header-collapsed" );
-		this._addClass( this.active.next(), "ui-accordion-content-active" );
-		this.active.next().show();
-
-		this.headers
-			.attr( "role", "tab" )
-			.each( function() {
-				var header = $( this ),
-					headerId = header.uniqueId().attr( "id" ),
-					panel = header.next(),
-					panelId = panel.uniqueId().attr( "id" );
-				header.attr( "aria-controls", panelId );
-				panel.attr( "aria-labelledby", headerId );
-			} )
-			.next()
-				.attr( "role", "tabpanel" );
-
-		this.headers
-			.not( this.active )
-				.attr( {
-					"aria-selected": "false",
-					"aria-expanded": "false",
-					tabIndex: -1
-				} )
-				.next()
-					.attr( {
-						"aria-hidden": "true"
-					} )
-					.hide();
-
-		// Make sure at least one header is in the tab order
-		if ( !this.active.length ) {
-			this.headers.eq( 0 ).attr( "tabIndex", 0 );
-		} else {
-			this.active.attr( {
-				"aria-selected": "true",
-				"aria-expanded": "true",
-				tabIndex: 0
-			} )
-				.next()
-					.attr( {
-						"aria-hidden": "false"
-					} );
-		}
-
-		this._createIcons();
-
-		this._setupEvents( options.event );
-
-		if ( heightStyle === "fill" ) {
-			maxHeight = parent.height();
-			this.element.siblings( ":visible" ).each( function() {
-				var elem = $( this ),
-					position = elem.css( "position" );
-
-				if ( position === "absolute" || position === "fixed" ) {
-					return;
-				}
-				maxHeight -= elem.outerHeight( true );
-			} );
-
-			this.headers.each( function() {
-				maxHeight -= $( this ).outerHeight( true );
-			} );
-
-			this.headers.next()
-				.each( function() {
-					$( this ).height( Math.max( 0, maxHeight -
-						$( this ).innerHeight() + $( this ).height() ) );
-				} )
-				.css( "overflow", "auto" );
-		} else if ( heightStyle === "auto" ) {
-			maxHeight = 0;
-			this.headers.next()
-				.each( function() {
-					var isVisible = $( this ).is( ":visible" );
-					if ( !isVisible ) {
-						$( this ).show();
-					}
-					maxHeight = Math.max( maxHeight, $( this ).css( "height", "" ).height() );
-					if ( !isVisible ) {
-						$( this ).hide();
-					}
-				} )
-				.height( maxHeight );
-		}
-	},
-
-	_activate: function( index ) {
-		var active = this._findActive( index )[ 0 ];
-
-		// Trying to activate the already active panel
-		if ( active === this.active[ 0 ] ) {
-			return;
-		}
-
-		// Trying to collapse, simulate a click on the currently active header
-		active = active || this.active[ 0 ];
-
-		this._eventHandler( {
-			target: active,
-			currentTarget: active,
-			preventDefault: $.noop
-		} );
-	},
-
-	_findActive: function( selector ) {
-		return typeof selector === "number" ? this.headers.eq( selector ) : $();
-	},
-
-	_setupEvents: function( event ) {
-		var events = {
-			keydown: "_keydown"
-		};
-		if ( event ) {
-			$.each( event.split( " " ), function( index, eventName ) {
-				events[ eventName ] = "_eventHandler";
-			} );
-		}
-
-		this._off( this.headers.add( this.headers.next() ) );
-		this._on( this.headers, events );
-		this._on( this.headers.next(), { keydown: "_panelKeyDown" } );
-		this._hoverable( this.headers );
-		this._focusable( this.headers );
-	},
-
-	_eventHandler: function( event ) {
-		var activeChildren, clickedChildren,
-			options = this.options,
-			active = this.active,
-			clicked = $( event.currentTarget ),
-			clickedIsActive = clicked[ 0 ] === active[ 0 ],
-			collapsing = clickedIsActive && options.collapsible,
-			toShow = collapsing ? $() : clicked.next(),
-			toHide = active.next(),
-			eventData = {
-				oldHeader: active,
-				oldPanel: toHide,
-				newHeader: collapsing ? $() : clicked,
-				newPanel: toShow
-			};
-
-		event.preventDefault();
-
-		if (
-
-				// click on active header, but not collapsible
-				( clickedIsActive && !options.collapsible ) ||
-
-				// allow canceling activation
-				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
-			return;
-		}
-
-		options.active = collapsing ? false : this.headers.index( clicked );
-
-		// When the call to ._toggle() comes after the class changes
-		// it causes a very odd bug in IE 8 (see #6720)
-		this.active = clickedIsActive ? $() : clicked;
-		this._toggle( eventData );
-
-		// Switch classes
-		// corner classes on the previously active header stay after the animation
-		this._removeClass( active, "ui-accordion-header-active", "ui-state-active" );
-		if ( options.icons ) {
-			activeChildren = active.children( ".ui-accordion-header-icon" );
-			this._removeClass( activeChildren, null, options.icons.activeHeader )
-				._addClass( activeChildren, null, options.icons.header );
-		}
-
-		if ( !clickedIsActive ) {
-			this._removeClass( clicked, "ui-accordion-header-collapsed" )
-				._addClass( clicked, "ui-accordion-header-active", "ui-state-active" );
-			if ( options.icons ) {
-				clickedChildren = clicked.children( ".ui-accordion-header-icon" );
-				this._removeClass( clickedChildren, null, options.icons.header )
-					._addClass( clickedChildren, null, options.icons.activeHeader );
-			}
-
-			this._addClass( clicked.next(), "ui-accordion-content-active" );
-		}
-	},
-
-	_toggle: function( data ) {
-		var toShow = data.newPanel,
-			toHide = this.prevShow.length ? this.prevShow : data.oldPanel;
-
-		// Handle activating a panel during the animation for another activation
-		this.prevShow.add( this.prevHide ).stop( true, true );
-		this.prevShow = toShow;
-		this.prevHide = toHide;
-
-		if ( this.options.animate ) {
-			this._animate( toShow, toHide, data );
-		} else {
-			toHide.hide();
-			toShow.show();
-			this._toggleComplete( data );
-		}
-
-		toHide.attr( {
-			"aria-hidden": "true"
-		} );
-		toHide.prev().attr( {
-			"aria-selected": "false",
-			"aria-expanded": "false"
-		} );
-
-		// if we're switching panels, remove the old header from the tab order
-		// if we're opening from collapsed state, remove the previous header from the tab order
-		// if we're collapsing, then keep the collapsing header in the tab order
-		if ( toShow.length && toHide.length ) {
-			toHide.prev().attr( {
-				"tabIndex": -1,
-				"aria-expanded": "false"
-			} );
-		} else if ( toShow.length ) {
-			this.headers.filter( function() {
-				return parseInt( $( this ).attr( "tabIndex" ), 10 ) === 0;
-			} )
-				.attr( "tabIndex", -1 );
-		}
-
-		toShow
-			.attr( "aria-hidden", "false" )
-			.prev()
-				.attr( {
-					"aria-selected": "true",
-					"aria-expanded": "true",
-					tabIndex: 0
-				} );
-	},
-
-	_animate: function( toShow, toHide, data ) {
-		var total, easing, duration,
-			that = this,
-			adjust = 0,
-			boxSizing = toShow.css( "box-sizing" ),
-			down = toShow.length &&
-				( !toHide.length || ( toShow.index() < toHide.index() ) ),
-			animate = this.options.animate || {},
-			options = down && animate.down || animate,
-			complete = function() {
-				that._toggleComplete( data );
-			};
-
-		if ( typeof options === "number" ) {
-			duration = options;
-		}
-		if ( typeof options === "string" ) {
-			easing = options;
-		}
-
-		// fall back from options to animation in case of partial down settings
-		easing = easing || options.easing || animate.easing;
-		duration = duration || options.duration || animate.duration;
-
-		if ( !toHide.length ) {
-			return toShow.animate( this.showProps, duration, easing, complete );
-		}
-		if ( !toShow.length ) {
-			return toHide.animate( this.hideProps, duration, easing, complete );
-		}
-
-		total = toShow.show().outerHeight();
-		toHide.animate( this.hideProps, {
-			duration: duration,
-			easing: easing,
-			step: function( now, fx ) {
-				fx.now = Math.round( now );
-			}
-		} );
-		toShow
-			.hide()
-			.animate( this.showProps, {
-				duration: duration,
-				easing: easing,
-				complete: complete,
-				step: function( now, fx ) {
-					fx.now = Math.round( now );
-					if ( fx.prop !== "height" ) {
-						if ( boxSizing === "content-box" ) {
-							adjust += fx.now;
-						}
-					} else if ( that.options.heightStyle !== "content" ) {
-						fx.now = Math.round( total - toHide.outerHeight() - adjust );
-						adjust = 0;
-					}
-				}
-			} );
-	},
-
-	_toggleComplete: function( data ) {
-		var toHide = data.oldPanel,
-			prev = toHide.prev();
-
-		this._removeClass( toHide, "ui-accordion-content-active" );
-		this._removeClass( prev, "ui-accordion-header-active" )
-			._addClass( prev, "ui-accordion-header-collapsed" );
-
-		// Work around for rendering bug in IE (#5421)
-		if ( toHide.length ) {
-			toHide.parent()[ 0 ].className = toHide.parent()[ 0 ].className;
-		}
-		this._trigger( "activate", null, data );
-	}
-} );
-
-
-
-var safeActiveElement = $.ui.safeActiveElement = function( document ) {
-	var activeElement;
-
-	// Support: IE 9 only
-	// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
-	try {
-		activeElement = document.activeElement;
-	} catch ( error ) {
-		activeElement = document.body;
-	}
-
-	// Support: IE 9 - 11 only
-	// IE may return null instead of an element
-	// Interestingly, this only seems to occur when NOT in an iframe
-	if ( !activeElement ) {
-		activeElement = document.body;
-	}
-
-	// Support: IE 11 only
-	// IE11 returns a seemingly empty object in some cases when accessing
-	// document.activeElement from an <iframe>
-	if ( !activeElement.nodeName ) {
-		activeElement = document.body;
-	}
-
-	return activeElement;
-};
-
-
-/*!
- * jQuery UI Menu 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Menu
-//>>group: Widgets
-//>>description: Creates nestable menus.
-//>>docs: http://api.jqueryui.com/menu/
-//>>demos: http://jqueryui.com/menu/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/menu.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-var widgetsMenu = $.widget( "ui.menu", {
-	version: "1.12.1",
-	defaultElement: "<ul>",
-	delay: 300,
-	options: {
-		icons: {
-			submenu: "ui-icon-caret-1-e"
-		},
-		items: "> *",
-		menus: "ul",
-		position: {
-			my: "left top",
-			at: "right top"
-		},
-		role: "menu",
-
-		// Callbacks
-		blur: null,
-		focus: null,
-		select: null
-	},
-
-	_create: function() {
-		this.activeMenu = this.element;
-
-		// Flag used to prevent firing of the click handler
-		// as the event bubbles up through nested menus
-		this.mouseHandled = false;
-		this.element
-			.uniqueId()
-			.attr( {
-				role: this.options.role,
-				tabIndex: 0
-			} );
-
-		this._addClass( "ui-menu", "ui-widget ui-widget-content" );
-		this._on( {
-
-			// Prevent focus from sticking to links inside menu after clicking
-			// them (focus should always stay on UL during navigation).
-			"mousedown .ui-menu-item": function( event ) {
-				event.preventDefault();
-			},
-			"click .ui-menu-item": function( event ) {
-				var target = $( event.target );
-				var active = $( $.ui.safeActiveElement( this.document[ 0 ] ) );
-				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
-					this.select( event );
-
-					// Only set the mouseHandled flag if the event will bubble, see #9469.
-					if ( !event.isPropagationStopped() ) {
-						this.mouseHandled = true;
-					}
-
-					// Open submenu on click
-					if ( target.has( ".ui-menu" ).length ) {
-						this.expand( event );
-					} else if ( !this.element.is( ":focus" ) &&
-							active.closest( ".ui-menu" ).length ) {
-
-						// Redirect focus to the menu
-						this.element.trigger( "focus", [ true ] );
-
-						// If the active item is on the top level, let it stay active.
-						// Otherwise, blur the active item since it is no longer visible.
-						if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
-							clearTimeout( this.timer );
-						}
-					}
-				}
-			},
-			"mouseenter .ui-menu-item": function( event ) {
-
-				// Ignore mouse events while typeahead is active, see #10458.
-				// Prevents focusing the wrong item when typeahead causes a scroll while the mouse
-				// is over an item in the menu
-				if ( this.previousFilter ) {
-					return;
-				}
-
-				var actualTarget = $( event.target ).closest( ".ui-menu-item" ),
-					target = $( event.currentTarget );
-
-				// Ignore bubbled events on parent items, see #11641
-				if ( actualTarget[ 0 ] !== target[ 0 ] ) {
-					return;
-				}
-
-				// Remove ui-state-active class from siblings of the newly focused menu item
-				// to avoid a jump caused by adjacent elements both having a class with a border
-				this._removeClass( target.siblings().children( ".ui-state-active" ),
-					null, "ui-state-active" );
-				this.focus( event, target );
-			},
-			mouseleave: "collapseAll",
-			"mouseleave .ui-menu": "collapseAll",
-			focus: function( event, keepActiveItem ) {
-
-				// If there's already an active item, keep it active
-				// If not, activate the first item
-				var item = this.active || this.element.find( this.options.items ).eq( 0 );
-
-				if ( !keepActiveItem ) {
-					this.focus( event, item );
-				}
-			},
-			blur: function( event ) {
-				this._delay( function() {
-					var notContained = !$.contains(
-						this.element[ 0 ],
-						$.ui.safeActiveElement( this.document[ 0 ] )
-					);
-					if ( notContained ) {
-						this.collapseAll( event );
-					}
-				} );
-			},
-			keydown: "_keydown"
-		} );
-
-		this.refresh();
-
-		// Clicks outside of a menu collapse any open menus
-		this._on( this.document, {
-			click: function( event ) {
-				if ( this._closeOnDocumentClick( event ) ) {
-					this.collapseAll( event );
-				}
-
-				// Reset the mouseHandled flag
-				this.mouseHandled = false;
-			}
-		} );
-	},
-
-	_destroy: function() {
-		var items = this.element.find( ".ui-menu-item" )
-				.removeAttr( "role aria-disabled" ),
-			submenus = items.children( ".ui-menu-item-wrapper" )
-				.removeUniqueId()
-				.removeAttr( "tabIndex role aria-haspopup" );
-
-		// Destroy (sub)menus
-		this.element
-			.removeAttr( "aria-activedescendant" )
-			.find( ".ui-menu" ).addBack()
-				.removeAttr( "role aria-labelledby aria-expanded aria-hidden aria-disabled " +
-					"tabIndex" )
-				.removeUniqueId()
-				.show();
-
-		submenus.children().each( function() {
-			var elem = $( this );
-			if ( elem.data( "ui-menu-submenu-caret" ) ) {
-				elem.remove();
-			}
-		} );
-	},
-
-	_keydown: function( event ) {
-		var match, prev, character, skip,
-			preventDefault = true;
-
-		switch ( event.keyCode ) {
-		case $.ui.keyCode.PAGE_UP:
-			this.previousPage( event );
-			break;
-		case $.ui.keyCode.PAGE_DOWN:
-			this.nextPage( event );
-			break;
-		case $.ui.keyCode.HOME:
-			this._move( "first", "first", event );
-			break;
-		case $.ui.keyCode.END:
-			this._move( "last", "last", event );
-			break;
-		case $.ui.keyCode.UP:
-			this.previous( event );
-			break;
-		case $.ui.keyCode.DOWN:
-			this.next( event );
-			break;
-		case $.ui.keyCode.LEFT:
-			this.collapse( event );
-			break;
-		case $.ui.keyCode.RIGHT:
-			if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
-				this.expand( event );
-			}
-			break;
-		case $.ui.keyCode.ENTER:
-		case $.ui.keyCode.SPACE:
-			this._activate( event );
-			break;
-		case $.ui.keyCode.ESCAPE:
-			this.collapse( event );
-			break;
-		default:
-			preventDefault = false;
-			prev = this.previousFilter || "";
-			skip = false;
-
-			// Support number pad values
-			character = event.keyCode >= 96 && event.keyCode <= 105 ?
-				( event.keyCode - 96 ).toString() : String.fromCharCode( event.keyCode );
-
-			clearTimeout( this.filterTimer );
-
-			if ( character === prev ) {
-				skip = true;
-			} else {
-				character = prev + character;
-			}
-
-			match = this._filterMenuItems( character );
-			match = skip && match.index( this.active.next() ) !== -1 ?
-				this.active.nextAll( ".ui-menu-item" ) :
-				match;
-
-			// If no matches on the current filter, reset to the last character pressed
-			// to move down the menu to the first item that starts with that character
-			if ( !match.length ) {
-				character = String.fromCharCode( event.keyCode );
-				match = this._filterMenuItems( character );
-			}
-
-			if ( match.length ) {
-				this.focus( event, match );
-				this.previousFilter = character;
-				this.filterTimer = this._delay( function() {
-					delete this.previousFilter;
-				}, 1000 );
-			} else {
-				delete this.previousFilter;
-			}
-		}
-
-		if ( preventDefault ) {
-			event.preventDefault();
-		}
-	},
-
-	_activate: function( event ) {
-		if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
-			if ( this.active.children( "[aria-haspopup='true']" ).length ) {
-				this.expand( event );
-			} else {
-				this.select( event );
-			}
-		}
-	},
-
-	refresh: function() {
-		var menus, items, newSubmenus, newItems, newWrappers,
-			that = this,
-			icon = this.options.icons.submenu,
-			submenus = this.element.find( this.options.menus );
-
-		this._toggleClass( "ui-menu-icons", null, !!this.element.find( ".ui-icon" ).length );
-
-		// Initialize nested menus
-		newSubmenus = submenus.filter( ":not(.ui-menu)" )
-			.hide()
-			.attr( {
-				role: this.options.role,
-				"aria-hidden": "true",
-				"aria-expanded": "false"
-			} )
-			.each( function() {
-				var menu = $( this ),
-					item = menu.prev(),
-					submenuCaret = $( "<span>" ).data( "ui-menu-submenu-caret", true );
-
-				that._addClass( submenuCaret, "ui-menu-icon", "ui-icon " + icon );
-				item
-					.attr( "aria-haspopup", "true" )
-					.prepend( submenuCaret );
-				menu.attr( "aria-labelledby", item.attr( "id" ) );
-			} );
-
-		this._addClass( newSubmenus, "ui-menu", "ui-widget ui-widget-content ui-front" );
-
-		menus = submenus.add( this.element );
-		items = menus.find( this.options.items );
-
-		// Initialize menu-items containing spaces and/or dashes only as dividers
-		items.not( ".ui-menu-item" ).each( function() {
-			var item = $( this );
-			if ( that._isDivider( item ) ) {
-				that._addClass( item, "ui-menu-divider", "ui-widget-content" );
-			}
-		} );
-
-		// Don't refresh list items that are already adapted
-		newItems = items.not( ".ui-menu-item, .ui-menu-divider" );
-		newWrappers = newItems.children()
-			.not( ".ui-menu" )
-				.uniqueId()
-				.attr( {
-					tabIndex: -1,
-					role: this._itemRole()
-				} );
-		this._addClass( newItems, "ui-menu-item" )
-			._addClass( newWrappers, "ui-menu-item-wrapper" );
-
-		// Add aria-disabled attribute to any disabled menu item
-		items.filter( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
-
-		// If the active item has been removed, blur the menu
-		if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
-			this.blur();
-		}
-	},
-
-	_itemRole: function() {
-		return {
-			menu: "menuitem",
-			listbox: "option"
-		}[ this.options.role ];
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "icons" ) {
-			var icons = this.element.find( ".ui-menu-icon" );
-			this._removeClass( icons, null, this.options.icons.submenu )
-				._addClass( icons, null, value.submenu );
-		}
-		this._super( key, value );
-	},
-
-	_setOptionDisabled: function( value ) {
-		this._super( value );
-
-		this.element.attr( "aria-disabled", String( value ) );
-		this._toggleClass( null, "ui-state-disabled", !!value );
-	},
-
-	focus: function( event, item ) {
-		var nested, focused, activeParent;
-		this.blur( event, event && event.type === "focus" );
-
-		this._scrollIntoView( item );
-
-		this.active = item.first();
-
-		focused = this.active.children( ".ui-menu-item-wrapper" );
-		this._addClass( focused, null, "ui-state-active" );
-
-		// Only update aria-activedescendant if there's a role
-		// otherwise we assume focus is managed elsewhere
-		if ( this.options.role ) {
-			this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
-		}
-
-		// Highlight active parent menu item, if any
-		activeParent = this.active
-			.parent()
-				.closest( ".ui-menu-item" )
-					.children( ".ui-menu-item-wrapper" );
-		this._addClass( activeParent, null, "ui-state-active" );
-
-		if ( event && event.type === "keydown" ) {
-			this._close();
-		} else {
-			this.timer = this._delay( function() {
-				this._close();
-			}, this.delay );
-		}
-
-		nested = item.children( ".ui-menu" );
-		if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
-			this._startOpening( nested );
-		}
-		this.activeMenu = item.parent();
-
-		this._trigger( "focus", event, { item: item } );
-	},
-
-	_scrollIntoView: function( item ) {
-		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
-		if ( this._hasScroll() ) {
-			borderTop = parseFloat( $.css( this.activeMenu[ 0 ], "borderTopWidth" ) ) || 0;
-			paddingTop = parseFloat( $.css( this.activeMenu[ 0 ], "paddingTop" ) ) || 0;
-			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
-			scroll = this.activeMenu.scrollTop();
-			elementHeight = this.activeMenu.height();
-			itemHeight = item.outerHeight();
-
-			if ( offset < 0 ) {
-				this.activeMenu.scrollTop( scroll + offset );
-			} else if ( offset + itemHeight > elementHeight ) {
-				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
-			}
-		}
-	},
-
-	blur: function( event, fromFocus ) {
-		if ( !fromFocus ) {
-			clearTimeout( this.timer );
-		}
-
-		if ( !this.active ) {
-			return;
-		}
-
-		this._removeClass( this.active.children( ".ui-menu-item-wrapper" ),
-			null, "ui-state-active" );
-
-		this._trigger( "blur", event, { item: this.active } );
-		this.active = null;
-	},
-
-	_startOpening: function( submenu ) {
-		clearTimeout( this.timer );
-
-		// Don't open if already open fixes a Firefox bug that caused a .5 pixel
-		// shift in the submenu position when mousing over the caret icon
-		if ( submenu.attr( "aria-hidden" ) !== "true" ) {
-			return;
-		}
-
-		this.timer = this._delay( function() {
-			this._close();
-			this._open( submenu );
-		}, this.delay );
-	},
-
-	_open: function( submenu ) {
-		var position = $.extend( {
-			of: this.active
-		}, this.options.position );
-
-		clearTimeout( this.timer );
-		this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
-			.hide()
-			.attr( "aria-hidden", "true" );
-
-		submenu
-			.show()
-			.removeAttr( "aria-hidden" )
-			.attr( "aria-expanded", "true" )
-			.position( position );
-	},
-
-	collapseAll: function( event, all ) {
-		clearTimeout( this.timer );
-		this.timer = this._delay( function() {
-
-			// If we were passed an event, look for the submenu that contains the event
-			var currentMenu = all ? this.element :
-				$( event && event.target ).closest( this.element.find( ".ui-menu" ) );
-
-			// If we found no valid submenu ancestor, use the main menu to close all
-			// sub menus anyway
-			if ( !currentMenu.length ) {
-				currentMenu = this.element;
-			}
-
-			this._close( currentMenu );
-
-			this.blur( event );
-
-			// Work around active item staying active after menu is blurred
-			this._removeClass( currentMenu.find( ".ui-state-active" ), null, "ui-state-active" );
-
-			this.activeMenu = currentMenu;
-		}, this.delay );
-	},
-
-	// With no arguments, closes the currently active menu - if nothing is active
-	// it closes all menus.  If passed an argument, it will search for menus BELOW
-	_close: function( startMenu ) {
-		if ( !startMenu ) {
-			startMenu = this.active ? this.active.parent() : this.element;
-		}
-
-		startMenu.find( ".ui-menu" )
-			.hide()
-			.attr( "aria-hidden", "true" )
-			.attr( "aria-expanded", "false" );
-	},
-
-	_closeOnDocumentClick: function( event ) {
-		return !$( event.target ).closest( ".ui-menu" ).length;
-	},
-
-	_isDivider: function( item ) {
-
-		// Match hyphen, em dash, en dash
-		return !/[^\-\u2014\u2013\s]/.test( item.text() );
-	},
-
-	collapse: function( event ) {
-		var newItem = this.active &&
-			this.active.parent().closest( ".ui-menu-item", this.element );
-		if ( newItem && newItem.length ) {
-			this._close();
-			this.focus( event, newItem );
-		}
-	},
-
-	expand: function( event ) {
-		var newItem = this.active &&
-			this.active
-				.children( ".ui-menu " )
-					.find( this.options.items )
-						.first();
-
-		if ( newItem && newItem.length ) {
-			this._open( newItem.parent() );
-
-			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
-			this._delay( function() {
-				this.focus( event, newItem );
-			} );
-		}
-	},
-
-	next: function( event ) {
-		this._move( "next", "first", event );
-	},
-
-	previous: function( event ) {
-		this._move( "prev", "last", event );
-	},
-
-	isFirstItem: function() {
-		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
-	},
-
-	isLastItem: function() {
-		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
-	},
-
-	_move: function( direction, filter, event ) {
-		var next;
-		if ( this.active ) {
-			if ( direction === "first" || direction === "last" ) {
-				next = this.active
-					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
-					.eq( -1 );
-			} else {
-				next = this.active
-					[ direction + "All" ]( ".ui-menu-item" )
-					.eq( 0 );
-			}
-		}
-		if ( !next || !next.length || !this.active ) {
-			next = this.activeMenu.find( this.options.items )[ filter ]();
-		}
-
-		this.focus( event, next );
-	},
-
-	nextPage: function( event ) {
-		var item, base, height;
-
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isLastItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.nextAll( ".ui-menu-item" ).each( function() {
-				item = $( this );
-				return item.offset().top - base - height < 0;
-			} );
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.find( this.options.items )
-				[ !this.active ? "first" : "last" ]() );
-		}
-	},
-
-	previousPage: function( event ) {
-		var item, base, height;
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isFirstItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.prevAll( ".ui-menu-item" ).each( function() {
-				item = $( this );
-				return item.offset().top - base + height > 0;
-			} );
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.find( this.options.items ).first() );
-		}
-	},
-
-	_hasScroll: function() {
-		return this.element.outerHeight() < this.element.prop( "scrollHeight" );
-	},
-
-	select: function( event ) {
-
-		// TODO: It should never be possible to not have an active item at this
-		// point, but the tests don't trigger mouseenter before click.
-		this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
-		var ui = { item: this.active };
-		if ( !this.active.has( ".ui-menu" ).length ) {
-			this.collapseAll( event, true );
-		}
-		this._trigger( "select", event, ui );
-	},
-
-	_filterMenuItems: function( character ) {
-		var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ),
-			regex = new RegExp( "^" + escapedCharacter, "i" );
-
-		return this.activeMenu
-			.find( this.options.items )
-
-				// Only match on items, not dividers or other content (#10571)
-				.filter( ".ui-menu-item" )
-					.filter( function() {
-						return regex.test(
-							$.trim( $( this ).children( ".ui-menu-item-wrapper" ).text() ) );
-					} );
-	}
-} );
-
-
-/*!
- * jQuery UI Autocomplete 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Autocomplete
-//>>group: Widgets
-//>>description: Lists suggested words as the user is typing.
-//>>docs: http://api.jqueryui.com/autocomplete/
-//>>demos: http://jqueryui.com/autocomplete/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/autocomplete.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-$.widget( "ui.autocomplete", {
-	version: "1.12.1",
-	defaultElement: "<input>",
-	options: {
-		appendTo: null,
-		autoFocus: false,
-		delay: 300,
-		minLength: 1,
-		position: {
-			my: "left top",
-			at: "left bottom",
-			collision: "none"
-		},
-		source: null,
-
-		// Callbacks
-		change: null,
-		close: null,
-		focus: null,
-		open: null,
-		response: null,
-		search: null,
-		select: null
-	},
-
-	requestIndex: 0,
-	pending: 0,
-
-	_create: function() {
-
-		// Some browsers only repeat keydown events, not keypress events,
-		// so we use the suppressKeyPress flag to determine if we've already
-		// handled the keydown event. #7269
-		// Unfortunately the code for & in keypress is the same as the up arrow,
-		// so we use the suppressKeyPressRepeat flag to avoid handling keypress
-		// events when we know the keydown event was used to modify the
-		// search term. #7799
-		var suppressKeyPress, suppressKeyPressRepeat, suppressInput,
-			nodeName = this.element[ 0 ].nodeName.toLowerCase(),
-			isTextarea = nodeName === "textarea",
-			isInput = nodeName === "input";
-
-		// Textareas are always multi-line
-		// Inputs are always single-line, even if inside a contentEditable element
-		// IE also treats inputs as contentEditable
-		// All other element types are determined by whether or not they're contentEditable
-		this.isMultiLine = isTextarea || !isInput && this._isContentEditable( this.element );
-
-		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
-		this.isNewMenu = true;
-
-		this._addClass( "ui-autocomplete-input" );
-		this.element.attr( "autocomplete", "off" );
-
-		this._on( this.element, {
-			keydown: function( event ) {
-				if ( this.element.prop( "readOnly" ) ) {
-					suppressKeyPress = true;
-					suppressInput = true;
-					suppressKeyPressRepeat = true;
-					return;
-				}
-
-				suppressKeyPress = false;
-				suppressInput = false;
-				suppressKeyPressRepeat = false;
-				var keyCode = $.ui.keyCode;
-				switch ( event.keyCode ) {
-				case keyCode.PAGE_UP:
-					suppressKeyPress = true;
-					this._move( "previousPage", event );
-					break;
-				case keyCode.PAGE_DOWN:
-					suppressKeyPress = true;
-					this._move( "nextPage", event );
-					break;
-				case keyCode.UP:
-					suppressKeyPress = true;
-					this._keyEvent( "previous", event );
-					break;
-				case keyCode.DOWN:
-					suppressKeyPress = true;
-					this._keyEvent( "next", event );
-					break;
-				case keyCode.ENTER:
-
-					// when menu is open and has focus
-					if ( this.menu.active ) {
-
-						// #6055 - Opera still allows the keypress to occur
-						// which causes forms to submit
-						suppressKeyPress = true;
-						event.preventDefault();
-						this.menu.select( event );
-					}
-					break;
-				case keyCode.TAB:
-					if ( this.menu.active ) {
-						this.menu.select( event );
-					}
-					break;
-				case keyCode.ESCAPE:
-					if ( this.menu.element.is( ":visible" ) ) {
-						if ( !this.isMultiLine ) {
-							this._value( this.term );
-						}
-						this.close( event );
-
-						// Different browsers have different default behavior for escape
-						// Single press can mean undo or clear
-						// Double press in IE means clear the whole form
-						event.preventDefault();
-					}
-					break;
-				default:
-					suppressKeyPressRepeat = true;
-
-					// search timeout should be triggered before the input value is changed
-					this._searchTimeout( event );
-					break;
-				}
-			},
-			keypress: function( event ) {
-				if ( suppressKeyPress ) {
-					suppressKeyPress = false;
-					if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
-						event.preventDefault();
-					}
-					return;
-				}
-				if ( suppressKeyPressRepeat ) {
-					return;
-				}
-
-				// Replicate some key handlers to allow them to repeat in Firefox and Opera
-				var keyCode = $.ui.keyCode;
-				switch ( event.keyCode ) {
-				case keyCode.PAGE_UP:
-					this._move( "previousPage", event );
-					break;
-				case keyCode.PAGE_DOWN:
-					this._move( "nextPage", event );
-					break;
-				case keyCode.UP:
-					this._keyEvent( "previous", event );
-					break;
-				case keyCode.DOWN:
-					this._keyEvent( "next", event );
-					break;
-				}
-			},
-			input: function( event ) {
-				if ( suppressInput ) {
-					suppressInput = false;
-					event.preventDefault();
-					return;
-				}
-				this._searchTimeout( event );
-			},
-			focus: function() {
-				this.selectedItem = null;
-				this.previous = this._value();
-			},
-			blur: function( event ) {
-				if ( this.cancelBlur ) {
-					delete this.cancelBlur;
-					return;
-				}
-
-				clearTimeout( this.searching );
-				this.close( event );
-				this._change( event );
-			}
-		} );
-
-		this._initSource();
-		this.menu = $( "<ul>" )
-			.appendTo( this._appendTo() )
-			.menu( {
-
-				// disable ARIA support, the live region takes care of that
-				role: null
-			} )
-			.hide()
-			.menu( "instance" );
-
-		this._addClass( this.menu.element, "ui-autocomplete", "ui-front" );
-		this._on( this.menu.element, {
-			mousedown: function( event ) {
-
-				// prevent moving focus out of the text field
-				event.preventDefault();
-
-				// IE doesn't prevent moving focus even with event.preventDefault()
-				// so we set a flag to know when we should ignore the blur event
-				this.cancelBlur = true;
-				this._delay( function() {
-					delete this.cancelBlur;
-
-					// Support: IE 8 only
-					// Right clicking a menu item or selecting text from the menu items will
-					// result in focus moving out of the input. However, we've already received
-					// and ignored the blur event because of the cancelBlur flag set above. So
-					// we restore focus to ensure that the menu closes properly based on the user's
-					// next actions.
-					if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
-						this.element.trigger( "focus" );
-					}
-				} );
-			},
-			menufocus: function( event, ui ) {
-				var label, item;
-
-				// support: Firefox
-				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
-				if ( this.isNewMenu ) {
-					this.isNewMenu = false;
-					if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
-						this.menu.blur();
-
-						this.document.one( "mousemove", function() {
-							$( event.target ).trigger( event.originalEvent );
-						} );
-
-						return;
-					}
-				}
-
-				item = ui.item.data( "ui-autocomplete-item" );
-				if ( false !== this._trigger( "focus", event, { item: item } ) ) {
-
-					// use value to match what will end up in the input, if it was a key event
-					if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
-						this._value( item.value );
-					}
-				}
-
-				// Announce the value in the liveRegion
-				label = ui.item.attr( "aria-label" ) || item.value;
-				if ( label && $.trim( label ).length ) {
-					this.liveRegion.children().hide();
-					$( "<div>" ).text( label ).appendTo( this.liveRegion );
-				}
-			},
-			menuselect: function( event, ui ) {
-				var item = ui.item.data( "ui-autocomplete-item" ),
-					previous = this.previous;
-
-				// Only trigger when focus was lost (click on menu)
-				if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
-					this.element.trigger( "focus" );
-					this.previous = previous;
-
-					// #6109 - IE triggers two focus events and the second
-					// is asynchronous, so we need to reset the previous
-					// term synchronously and asynchronously :-(
-					this._delay( function() {
-						this.previous = previous;
-						this.selectedItem = item;
-					} );
-				}
-
-				if ( false !== this._trigger( "select", event, { item: item } ) ) {
-					this._value( item.value );
-				}
-
-				// reset the term after the select event
-				// this allows custom select handling to work properly
-				this.term = this._value();
-
-				this.close( event );
-				this.selectedItem = item;
-			}
-		} );
-
-		this.liveRegion = $( "<div>", {
-			role: "status",
-			"aria-live": "assertive",
-			"aria-relevant": "additions"
-		} )
-			.appendTo( this.document[ 0 ].body );
-
-		this._addClass( this.liveRegion, null, "ui-helper-hidden-accessible" );
-
-		// Turning off autocomplete prevents the browser from remembering the
-		// value when navigating through history, so we re-enable autocomplete
-		// if the page is unloaded before the widget is destroyed. #7790
-		this._on( this.window, {
-			beforeunload: function() {
-				this.element.removeAttr( "autocomplete" );
-			}
-		} );
-	},
-
-	_destroy: function() {
-		clearTimeout( this.searching );
-		this.element.removeAttr( "autocomplete" );
-		this.menu.element.remove();
-		this.liveRegion.remove();
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-		if ( key === "source" ) {
-			this._initSource();
-		}
-		if ( key === "appendTo" ) {
-			this.menu.element.appendTo( this._appendTo() );
-		}
-		if ( key === "disabled" && value && this.xhr ) {
-			this.xhr.abort();
-		}
-	},
-
-	_isEventTargetInWidget: function( event ) {
-		var menuElement = this.menu.element[ 0 ];
-
-		return event.target === this.element[ 0 ] ||
-			event.target === menuElement ||
-			$.contains( menuElement, event.target );
-	},
-
-	_closeOnClickOutside: function( event ) {
-		if ( !this._isEventTargetInWidget( event ) ) {
-			this.close();
-		}
-	},
-
-	_appendTo: function() {
-		var element = this.options.appendTo;
-
-		if ( element ) {
-			element = element.jquery || element.nodeType ?
-				$( element ) :
-				this.document.find( element ).eq( 0 );
-		}
-
-		if ( !element || !element[ 0 ] ) {
-			element = this.element.closest( ".ui-front, dialog" );
-		}
-
-		if ( !element.length ) {
-			element = this.document[ 0 ].body;
-		}
-
-		return element;
-	},
-
-	_initSource: function() {
-		var array, url,
-			that = this;
-		if ( $.isArray( this.options.source ) ) {
-			array = this.options.source;
-			this.source = function( request, response ) {
-				response( $.ui.autocomplete.filter( array, request.term ) );
-			};
-		} else if ( typeof this.options.source === "string" ) {
-			url = this.options.source;
-			this.source = function( request, response ) {
-				if ( that.xhr ) {
-					that.xhr.abort();
-				}
-				that.xhr = $.ajax( {
-					url: url,
-					data: request,
-					dataType: "json",
-					success: function( data ) {
-						response( data );
-					},
-					error: function() {
-						response( [] );
-					}
-				} );
-			};
-		} else {
-			this.source = this.options.source;
-		}
-	},
-
-	_searchTimeout: function( event ) {
-		clearTimeout( this.searching );
-		this.searching = this._delay( function() {
-
-			// Search if the value has changed, or if the user retypes the same value (see #7434)
-			var equalValues = this.term === this._value(),
-				menuVisible = this.menu.element.is( ":visible" ),
-				modifierKey = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
-
-			if ( !equalValues || ( equalValues && !menuVisible && !modifierKey ) ) {
-				this.selectedItem = null;
-				this.search( null, event );
-			}
-		}, this.options.delay );
-	},
-
-	search: function( value, event ) {
-		value = value != null ? value : this._value();
-
-		// Always save the actual value, not the one passed as an argument
-		this.term = this._value();
-
-		if ( value.length < this.options.minLength ) {
-			return this.close( event );
-		}
-
-		if ( this._trigger( "search", event ) === false ) {
-			return;
-		}
-
-		return this._search( value );
-	},
-
-	_search: function( value ) {
-		this.pending++;
-		this._addClass( "ui-autocomplete-loading" );
-		this.cancelSearch = false;
-
-		this.source( { term: value }, this._response() );
-	},
-
-	_response: function() {
-		var index = ++this.requestIndex;
-
-		return $.proxy( function( content ) {
-			if ( index === this.requestIndex ) {
-				this.__response( content );
-			}
-
-			this.pending--;
-			if ( !this.pending ) {
-				this._removeClass( "ui-autocomplete-loading" );
-			}
-		}, this );
-	},
-
-	__response: function( content ) {
-		if ( content ) {
-			content = this._normalize( content );
-		}
-		this._trigger( "response", null, { content: content } );
-		if ( !this.options.disabled && content && content.length && !this.cancelSearch ) {
-			this._suggest( content );
-			this._trigger( "open" );
-		} else {
-
-			// use ._close() instead of .close() so we don't cancel future searches
-			this._close();
-		}
-	},
-
-	close: function( event ) {
-		this.cancelSearch = true;
-		this._close( event );
-	},
-
-	_close: function( event ) {
-
-		// Remove the handler that closes the menu on outside clicks
-		this._off( this.document, "mousedown" );
-
-		if ( this.menu.element.is( ":visible" ) ) {
-			this.menu.element.hide();
-			this.menu.blur();
-			this.isNewMenu = true;
-			this._trigger( "close", event );
-		}
-	},
-
-	_change: function( event ) {
-		if ( this.previous !== this._value() ) {
-			this._trigger( "change", event, { item: this.selectedItem } );
-		}
-	},
-
-	_normalize: function( items ) {
-
-		// assume all items have the right format when the first item is complete
-		if ( items.length && items[ 0 ].label && items[ 0 ].value ) {
-			return items;
-		}
-		return $.map( items, function( item ) {
-			if ( typeof item === "string" ) {
-				return {
-					label: item,
-					value: item
-				};
-			}
-			return $.extend( {}, item, {
-				label: item.label || item.value,
-				value: item.value || item.label
-			} );
-		} );
-	},
-
-	_suggest: function( items ) {
-		var ul = this.menu.element.empty();
-		this._renderMenu( ul, items );
-		this.isNewMenu = true;
-		this.menu.refresh();
-
-		// Size and position menu
-		ul.show();
-		this._resizeMenu();
-		ul.position( $.extend( {
-			of: this.element
-		}, this.options.position ) );
-
-		if ( this.options.autoFocus ) {
-			this.menu.next();
-		}
-
-		// Listen for interactions outside of the widget (#6642)
-		this._on( this.document, {
-			mousedown: "_closeOnClickOutside"
-		} );
-	},
-
-	_resizeMenu: function() {
-		var ul = this.menu.element;
-		ul.outerWidth( Math.max(
-
-			// Firefox wraps long text (possibly a rounding bug)
-			// so we add 1px to avoid the wrapping (#7513)
-			ul.width( "" ).outerWidth() + 1,
-			this.element.outerWidth()
-		) );
-	},
-
-	_renderMenu: function( ul, items ) {
-		var that = this;
-		$.each( items, function( index, item ) {
-			that._renderItemData( ul, item );
-		} );
-	},
-
-	_renderItemData: function( ul, item ) {
-		return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
-	},
-
-	_renderItem: function( ul, item ) {
-		return $( "<li>" )
-			.append( $( "<div>" ).text( item.label ) )
-			.appendTo( ul );
-	},
-
-	_move: function( direction, event ) {
-		if ( !this.menu.element.is( ":visible" ) ) {
-			this.search( null, event );
-			return;
-		}
-		if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
-				this.menu.isLastItem() && /^next/.test( direction ) ) {
-
-			if ( !this.isMultiLine ) {
-				this._value( this.term );
-			}
-
-			this.menu.blur();
-			return;
-		}
-		this.menu[ direction ]( event );
-	},
-
-	widget: function() {
-		return this.menu.element;
-	},
-
-	_value: function() {
-		return this.valueMethod.apply( this.element, arguments );
-	},
-
-	_keyEvent: function( keyEvent, event ) {
-		if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
-			this._move( keyEvent, event );
-
-			// Prevents moving cursor to beginning/end of the text field in some browsers
-			event.preventDefault();
-		}
-	},
-
-	// Support: Chrome <=50
-	// We should be able to just use this.element.prop( "isContentEditable" )
-	// but hidden elements always report false in Chrome.
-	// https://code.google.com/p/chromium/issues/detail?id=313082
-	_isContentEditable: function( element ) {
-		if ( !element.length ) {
-			return false;
-		}
-
-		var editable = element.prop( "contentEditable" );
-
-		if ( editable === "inherit" ) {
-		  return this._isContentEditable( element.parent() );
-		}
-
-		return editable === "true";
-	}
-} );
-
-$.extend( $.ui.autocomplete, {
-	escapeRegex: function( value ) {
-		return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
-	},
-	filter: function( array, term ) {
-		var matcher = new RegExp( $.ui.autocomplete.escapeRegex( term ), "i" );
-		return $.grep( array, function( value ) {
-			return matcher.test( value.label || value.value || value );
-		} );
-	}
-} );
-
-// Live region extension, adding a `messages` option
-// NOTE: This is an experimental API. We are still investigating
-// a full solution for string manipulation and internationalization.
-$.widget( "ui.autocomplete", $.ui.autocomplete, {
-	options: {
-		messages: {
-			noResults: "No search results.",
-			results: function( amount ) {
-				return amount + ( amount > 1 ? " results are" : " result is" ) +
-					" available, use up and down arrow keys to navigate.";
-			}
-		}
-	},
-
-	__response: function( content ) {
-		var message;
-		this._superApply( arguments );
-		if ( this.options.disabled || this.cancelSearch ) {
-			return;
-		}
-		if ( content && content.length ) {
-			message = this.options.messages.results( content.length );
-		} else {
-			message = this.options.messages.noResults;
-		}
-		this.liveRegion.children().hide();
-		$( "<div>" ).text( message ).appendTo( this.liveRegion );
-	}
-} );
-
-var widgetsAutocomplete = $.ui.autocomplete;
-
-
-/*!
- * jQuery UI Controlgroup 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Controlgroup
-//>>group: Widgets
-//>>description: Visually groups form control widgets
-//>>docs: http://api.jqueryui.com/controlgroup/
-//>>demos: http://jqueryui.com/controlgroup/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/controlgroup.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-var controlgroupCornerRegex = /ui-corner-([a-z]){2,6}/g;
-
-var widgetsControlgroup = $.widget( "ui.controlgroup", {
-	version: "1.12.1",
-	defaultElement: "<div>",
-	options: {
-		direction: "horizontal",
-		disabled: null,
-		onlyVisible: true,
-		items: {
-			"button": "input[type=button], input[type=submit], input[type=reset], button, a",
-			"controlgroupLabel": ".ui-controlgroup-label",
-			"checkboxradio": "input[type='checkbox'], input[type='radio']",
-			"selectmenu": "select",
-			"spinner": ".ui-spinner-input"
-		}
-	},
-
-	_create: function() {
-		this._enhance();
-	},
-
-	// To support the enhanced option in jQuery Mobile, we isolate DOM manipulation
-	_enhance: function() {
-		this.element.attr( "role", "toolbar" );
-		this.refresh();
-	},
-
-	_destroy: function() {
-		this._callChildMethod( "destroy" );
-		this.childWidgets.removeData( "ui-controlgroup-data" );
-		this.element.removeAttr( "role" );
-		if ( this.options.items.controlgroupLabel ) {
-			this.element
-				.find( this.options.items.controlgroupLabel )
-				.find( ".ui-controlgroup-label-contents" )
-				.contents().unwrap();
-		}
-	},
-
-	_initWidgets: function() {
-		var that = this,
-			childWidgets = [];
-
-		// First we iterate over each of the items options
-		$.each( this.options.items, function( widget, selector ) {
-			var labels;
-			var options = {};
-
-			// Make sure the widget has a selector set
-			if ( !selector ) {
-				return;
-			}
-
-			if ( widget === "controlgroupLabel" ) {
-				labels = that.element.find( selector );
-				labels.each( function() {
-					var element = $( this );
-
-					if ( element.children( ".ui-controlgroup-label-contents" ).length ) {
-						return;
-					}
-					element.contents()
-						.wrapAll( "<span class='ui-controlgroup-label-contents'></span>" );
-				} );
-				that._addClass( labels, null, "ui-widget ui-widget-content ui-state-default" );
-				childWidgets = childWidgets.concat( labels.get() );
-				return;
-			}
-
-			// Make sure the widget actually exists
-			if ( !$.fn[ widget ] ) {
-				return;
-			}
-
-			// We assume everything is in the middle to start because we can't determine
-			// first / last elements until all enhancments are done.
-			if ( that[ "_" + widget + "Options" ] ) {
-				options = that[ "_" + widget + "Options" ]( "middle" );
-			} else {
-				options = { classes: {} };
-			}
-
-			// Find instances of this widget inside controlgroup and init them
-			that.element
-				.find( selector )
-				.each( function() {
-					var element = $( this );
-					var instance = element[ widget ]( "instance" );
-
-					// We need to clone the default options for this type of widget to avoid
-					// polluting the variable options which has a wider scope than a single widget.
-					var instanceOptions = $.widget.extend( {}, options );
-
-					// If the button is the child of a spinner ignore it
-					// TODO: Find a more generic solution
-					if ( widget === "button" && element.parent( ".ui-spinner" ).length ) {
-						return;
-					}
-
-					// Create the widget if it doesn't exist
-					if ( !instance ) {
-						instance = element[ widget ]()[ widget ]( "instance" );
-					}
-					if ( instance ) {
-						instanceOptions.classes =
-							that._resolveClassesValues( instanceOptions.classes, instance );
-					}
-					element[ widget ]( instanceOptions );
-
-					// Store an instance of the controlgroup to be able to reference
-					// from the outermost element for changing options and refresh
-					var widgetElement = element[ widget ]( "widget" );
-					$.data( widgetElement[ 0 ], "ui-controlgroup-data",
-						instance ? instance : element[ widget ]( "instance" ) );
-
-					childWidgets.push( widgetElement[ 0 ] );
-				} );
-		} );
-
-		this.childWidgets = $( $.unique( childWidgets ) );
-		this._addClass( this.childWidgets, "ui-controlgroup-item" );
-	},
-
-	_callChildMethod: function( method ) {
-		this.childWidgets.each( function() {
-			var element = $( this ),
-				data = element.data( "ui-controlgroup-data" );
-			if ( data && data[ method ] ) {
-				data[ method ]();
-			}
-		} );
-	},
-
-	_updateCornerClass: function( element, position ) {
-		var remove = "ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all";
-		var add = this._buildSimpleOptions( position, "label" ).classes.label;
-
-		this._removeClass( element, null, remove );
-		this._addClass( element, null, add );
-	},
-
-	_buildSimpleOptions: function( position, key ) {
-		var direction = this.options.direction === "vertical";
-		var result = {
-			classes: {}
-		};
-		result.classes[ key ] = {
-			"middle": "",
-			"first": "ui-corner-" + ( direction ? "top" : "left" ),
-			"last": "ui-corner-" + ( direction ? "bottom" : "right" ),
-			"only": "ui-corner-all"
-		}[ position ];
-
-		return result;
-	},
-
-	_spinnerOptions: function( position ) {
-		var options = this._buildSimpleOptions( position, "ui-spinner" );
-
-		options.classes[ "ui-spinner-up" ] = "";
-		options.classes[ "ui-spinner-down" ] = "";
-
-		return options;
-	},
-
-	_buttonOptions: function( position ) {
-		return this._buildSimpleOptions( position, "ui-button" );
-	},
-
-	_checkboxradioOptions: function( position ) {
-		return this._buildSimpleOptions( position, "ui-checkboxradio-label" );
-	},
-
-	_selectmenuOptions: function( position ) {
-		var direction = this.options.direction === "vertical";
-		return {
-			width: direction ? "auto" : false,
-			classes: {
-				middle: {
-					"ui-selectmenu-button-open": "",
-					"ui-selectmenu-button-closed": ""
-				},
-				first: {
-					"ui-selectmenu-button-open": "ui-corner-" + ( direction ? "top" : "tl" ),
-					"ui-selectmenu-button-closed": "ui-corner-" + ( direction ? "top" : "left" )
-				},
-				last: {
-					"ui-selectmenu-button-open": direction ? "" : "ui-corner-tr",
-					"ui-selectmenu-button-closed": "ui-corner-" + ( direction ? "bottom" : "right" )
-				},
-				only: {
-					"ui-selectmenu-button-open": "ui-corner-top",
-					"ui-selectmenu-button-closed": "ui-corner-all"
-				}
-
-			}[ position ]
-		};
-	},
-
-	_resolveClassesValues: function( classes, instance ) {
-		var result = {};
-		$.each( classes, function( key ) {
-			var current = instance.options.classes[ key ] || "";
-			current = $.trim( current.replace( controlgroupCornerRegex, "" ) );
-			result[ key ] = ( current + " " + classes[ key ] ).replace( /\s+/g, " " );
-		} );
-		return result;
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "direction" ) {
-			this._removeClass( "ui-controlgroup-" + this.options.direction );
-		}
-
-		this._super( key, value );
-		if ( key === "disabled" ) {
-			this._callChildMethod( value ? "disable" : "enable" );
-			return;
-		}
-
-		this.refresh();
-	},
-
-	refresh: function() {
-		var children,
-			that = this;
-
-		this._addClass( "ui-controlgroup ui-controlgroup-" + this.options.direction );
-
-		if ( this.options.direction === "horizontal" ) {
-			this._addClass( null, "ui-helper-clearfix" );
-		}
-		this._initWidgets();
-
-		children = this.childWidgets;
-
-		// We filter here because we need to track all childWidgets not just the visible ones
-		if ( this.options.onlyVisible ) {
-			children = children.filter( ":visible" );
-		}
-
-		if ( children.length ) {
-
-			// We do this last because we need to make sure all enhancment is done
-			// before determining first and last
-			$.each( [ "first", "last" ], function( index, value ) {
-				var instance = children[ value ]().data( "ui-controlgroup-data" );
-
-				if ( instance && that[ "_" + instance.widgetName + "Options" ] ) {
-					var options = that[ "_" + instance.widgetName + "Options" ](
-						children.length === 1 ? "only" : value
-					);
-					options.classes = that._resolveClassesValues( options.classes, instance );
-					instance.element[ instance.widgetName ]( options );
-				} else {
-					that._updateCornerClass( children[ value ](), value );
-				}
-			} );
-
-			// Finally call the refresh method on each of the child widgets.
-			this._callChildMethod( "refresh" );
-		}
-	}
-} );
-
-/*!
- * jQuery UI Checkboxradio 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Checkboxradio
-//>>group: Widgets
-//>>description: Enhances a form with multiple themeable checkboxes or radio buttons.
-//>>docs: http://api.jqueryui.com/checkboxradio/
-//>>demos: http://jqueryui.com/checkboxradio/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/button.css
-//>>css.structure: ../../themes/base/checkboxradio.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-$.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
-	version: "1.12.1",
-	options: {
-		disabled: null,
-		label: null,
-		icon: true,
-		classes: {
-			"ui-checkboxradio-label": "ui-corner-all",
-			"ui-checkboxradio-icon": "ui-corner-all"
-		}
-	},
-
-	_getCreateOptions: function() {
-		var disabled, labels;
-		var that = this;
-		var options = this._super() || {};
-
-		// We read the type here, because it makes more sense to throw a element type error first,
-		// rather then the error for lack of a label. Often if its the wrong type, it
-		// won't have a label (e.g. calling on a div, btn, etc)
-		this._readType();
-
-		labels = this.element.labels();
-
-		// If there are multiple labels, use the last one
-		this.label = $( labels[ labels.length - 1 ] );
-		if ( !this.label.length ) {
-			$.error( "No label found for checkboxradio widget" );
-		}
-
-		this.originalLabel = "";
-
-		// We need to get the label text but this may also need to make sure it does not contain the
-		// input itself.
-		this.label.contents().not( this.element[ 0 ] ).each( function() {
-
-			// The label contents could be text, html, or a mix. We concat each element to get a
-			// string representation of the label, without the input as part of it.
-			that.originalLabel += this.nodeType === 3 ? $( this ).text() : this.outerHTML;
-		} );
-
-		// Set the label option if we found label text
-		if ( this.originalLabel ) {
-			options.label = this.originalLabel;
-		}
-
-		disabled = this.element[ 0 ].disabled;
-		if ( disabled != null ) {
-			options.disabled = disabled;
-		}
-		return options;
-	},
-
-	_create: function() {
-		var checked = this.element[ 0 ].checked;
-
-		this._bindFormResetHandler();
-
-		if ( this.options.disabled == null ) {
-			this.options.disabled = this.element[ 0 ].disabled;
-		}
-
-		this._setOption( "disabled", this.options.disabled );
-		this._addClass( "ui-checkboxradio", "ui-helper-hidden-accessible" );
-		this._addClass( this.label, "ui-checkboxradio-label", "ui-button ui-widget" );
-
-		if ( this.type === "radio" ) {
-			this._addClass( this.label, "ui-checkboxradio-radio-label" );
-		}
-
-		if ( this.options.label && this.options.label !== this.originalLabel ) {
-			this._updateLabel();
-		} else if ( this.originalLabel ) {
-			this.options.label = this.originalLabel;
-		}
-
-		this._enhance();
-
-		if ( checked ) {
-			this._addClass( this.label, "ui-checkboxradio-checked", "ui-state-active" );
-			if ( this.icon ) {
-				this._addClass( this.icon, null, "ui-state-hover" );
-			}
-		}
-
-		this._on( {
-			change: "_toggleClasses",
-			focus: function() {
-				this._addClass( this.label, null, "ui-state-focus ui-visual-focus" );
-			},
-			blur: function() {
-				this._removeClass( this.label, null, "ui-state-focus ui-visual-focus" );
-			}
-		} );
-	},
-
-	_readType: function() {
-		var nodeName = this.element[ 0 ].nodeName.toLowerCase();
-		this.type = this.element[ 0 ].type;
-		if ( nodeName !== "input" || !/radio|checkbox/.test( this.type ) ) {
-			$.error( "Can't create checkboxradio on element.nodeName=" + nodeName +
-				" and element.type=" + this.type );
-		}
-	},
-
-	// Support jQuery Mobile enhanced option
-	_enhance: function() {
-		this._updateIcon( this.element[ 0 ].checked );
-	},
-
-	widget: function() {
-		return this.label;
-	},
-
-	_getRadioGroup: function() {
-		var group;
-		var name = this.element[ 0 ].name;
-		var nameSelector = "input[name='" + $.ui.escapeSelector( name ) + "']";
-
-		if ( !name ) {
-			return $( [] );
-		}
-
-		if ( this.form.length ) {
-			group = $( this.form[ 0 ].elements ).filter( nameSelector );
-		} else {
-
-			// Not inside a form, check all inputs that also are not inside a form
-			group = $( nameSelector ).filter( function() {
-				return $( this ).form().length === 0;
-			} );
-		}
-
-		return group.not( this.element );
-	},
-
-	_toggleClasses: function() {
-		var checked = this.element[ 0 ].checked;
-		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
-
-		if ( this.options.icon && this.type === "checkbox" ) {
-			this._toggleClass( this.icon, null, "ui-icon-check ui-state-checked", checked )
-				._toggleClass( this.icon, null, "ui-icon-blank", !checked );
-		}
-
-		if ( this.type === "radio" ) {
-			this._getRadioGroup()
-				.each( function() {
-					var instance = $( this ).checkboxradio( "instance" );
-
-					if ( instance ) {
-						instance._removeClass( instance.label,
-							"ui-checkboxradio-checked", "ui-state-active" );
-					}
-				} );
-		}
-	},
-
-	_destroy: function() {
-		this._unbindFormResetHandler();
-
-		if ( this.icon ) {
-			this.icon.remove();
-			this.iconSpace.remove();
-		}
-	},
-
-	_setOption: function( key, value ) {
-
-		// We don't allow the value to be set to nothing
-		if ( key === "label" && !value ) {
-			return;
-		}
-
-		this._super( key, value );
-
-		if ( key === "disabled" ) {
-			this._toggleClass( this.label, null, "ui-state-disabled", value );
-			this.element[ 0 ].disabled = value;
-
-			// Don't refresh when setting disabled
-			return;
-		}
-		this.refresh();
-	},
-
-	_updateIcon: function( checked ) {
-		var toAdd = "ui-icon ui-icon-background ";
-
-		if ( this.options.icon ) {
-			if ( !this.icon ) {
-				this.icon = $( "<span>" );
-				this.iconSpace = $( "<span> </span>" );
-				this._addClass( this.iconSpace, "ui-checkboxradio-icon-space" );
-			}
-
-			if ( this.type === "checkbox" ) {
-				toAdd += checked ? "ui-icon-check ui-state-checked" : "ui-icon-blank";
-				this._removeClass( this.icon, null, checked ? "ui-icon-blank" : "ui-icon-check" );
-			} else {
-				toAdd += "ui-icon-blank";
-			}
-			this._addClass( this.icon, "ui-checkboxradio-icon", toAdd );
-			if ( !checked ) {
-				this._removeClass( this.icon, null, "ui-icon-check ui-state-checked" );
-			}
-			this.icon.prependTo( this.label ).after( this.iconSpace );
-		} else if ( this.icon !== undefined ) {
-			this.icon.remove();
-			this.iconSpace.remove();
-			delete this.icon;
-		}
-	},
-
-	_updateLabel: function() {
-
-		// Remove the contents of the label ( minus the icon, icon space, and input )
-		var contents = this.label.contents().not( this.element[ 0 ] );
-		if ( this.icon ) {
-			contents = contents.not( this.icon[ 0 ] );
-		}
-		if ( this.iconSpace ) {
-			contents = contents.not( this.iconSpace[ 0 ] );
-		}
-		contents.remove();
-
-		this.label.append( this.options.label );
-	},
-
-	refresh: function() {
-		var checked = this.element[ 0 ].checked,
-			isDisabled = this.element[ 0 ].disabled;
-
-		this._updateIcon( checked );
-		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
-		if ( this.options.label !== null ) {
-			this._updateLabel();
-		}
-
-		if ( isDisabled !== this.options.disabled ) {
-			this._setOptions( { "disabled": isDisabled } );
-		}
-	}
-
-} ] );
-
-var widgetsCheckboxradio = $.ui.checkboxradio;
-
-
-/*!
- * jQuery UI Button 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Button
-//>>group: Widgets
-//>>description: Enhances a form with themeable buttons.
-//>>docs: http://api.jqueryui.com/button/
-//>>demos: http://jqueryui.com/button/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/button.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-$.widget( "ui.button", {
-	version: "1.12.1",
-	defaultElement: "<button>",
-	options: {
-		classes: {
-			"ui-button": "ui-corner-all"
-		},
-		disabled: null,
-		icon: null,
-		iconPosition: "beginning",
-		label: null,
-		showLabel: true
-	},
-
-	_getCreateOptions: function() {
-		var disabled,
-
-			// This is to support cases like in jQuery Mobile where the base widget does have
-			// an implementation of _getCreateOptions
-			options = this._super() || {};
-
-		this.isInput = this.element.is( "input" );
-
-		disabled = this.element[ 0 ].disabled;
-		if ( disabled != null ) {
-			options.disabled = disabled;
-		}
-
-		this.originalLabel = this.isInput ? this.element.val() : this.element.html();
-		if ( this.originalLabel ) {
-			options.label = this.originalLabel;
-		}
-
-		return options;
-	},
-
-	_create: function() {
-		if ( !this.option.showLabel & !this.options.icon ) {
-			this.options.showLabel = true;
-		}
-
-		// We have to check the option again here even though we did in _getCreateOptions,
-		// because null may have been passed on init which would override what was set in
-		// _getCreateOptions
-		if ( this.options.disabled == null ) {
-			this.options.disabled = this.element[ 0 ].disabled || false;
-		}
-
-		this.hasTitle = !!this.element.attr( "title" );
-
-		// Check to see if the label needs to be set or if its already correct
-		if ( this.options.label && this.options.label !== this.originalLabel ) {
-			if ( this.isInput ) {
-				this.element.val( this.options.label );
-			} else {
-				this.element.html( this.options.label );
-			}
-		}
-		this._addClass( "ui-button", "ui-widget" );
-		this._setOption( "disabled", this.options.disabled );
-		this._enhance();
-
-		if ( this.element.is( "a" ) ) {
-			this._on( {
-				"keyup": function( event ) {
-					if ( event.keyCode === $.ui.keyCode.SPACE ) {
-						event.preventDefault();
-
-						// Support: PhantomJS <= 1.9, IE 8 Only
-						// If a native click is available use it so we actually cause navigation
-						// otherwise just trigger a click event
-						if ( this.element[ 0 ].click ) {
-							this.element[ 0 ].click();
-						} else {
-							this.element.trigger( "click" );
-						}
-					}
-				}
-			} );
-		}
-	},
-
-	_enhance: function() {
-		if ( !this.element.is( "button" ) ) {
-			this.element.attr( "role", "button" );
-		}
-
-		if ( this.options.icon ) {
-			this._updateIcon( "icon", this.options.icon );
-			this._updateTooltip();
-		}
-	},
-
-	_updateTooltip: function() {
-		this.title = this.element.attr( "title" );
-
-		if ( !this.options.showLabel && !this.title ) {
-			this.element.attr( "title", this.options.label );
-		}
-	},
-
-	_updateIcon: function( option, value ) {
-		var icon = option !== "iconPosition",
-			position = icon ? this.options.iconPosition : value,
-			displayBlock = position === "top" || position === "bottom";
-
-		// Create icon
-		if ( !this.icon ) {
-			this.icon = $( "<span>" );
-
-			this._addClass( this.icon, "ui-button-icon", "ui-icon" );
-
-			if ( !this.options.showLabel ) {
-				this._addClass( "ui-button-icon-only" );
-			}
-		} else if ( icon ) {
-
-			// If we are updating the icon remove the old icon class
-			this._removeClass( this.icon, null, this.options.icon );
-		}
-
-		// If we are updating the icon add the new icon class
-		if ( icon ) {
-			this._addClass( this.icon, null, value );
-		}
-
-		this._attachIcon( position );
-
-		// If the icon is on top or bottom we need to add the ui-widget-icon-block class and remove
-		// the iconSpace if there is one.
-		if ( displayBlock ) {
-			this._addClass( this.icon, null, "ui-widget-icon-block" );
-			if ( this.iconSpace ) {
-				this.iconSpace.remove();
-			}
-		} else {
-
-			// Position is beginning or end so remove the ui-widget-icon-block class and add the
-			// space if it does not exist
-			if ( !this.iconSpace ) {
-				this.iconSpace = $( "<span> </span>" );
-				this._addClass( this.iconSpace, "ui-button-icon-space" );
-			}
-			this._removeClass( this.icon, null, "ui-wiget-icon-block" );
-			this._attachIconSpace( position );
-		}
-	},
-
-	_destroy: function() {
-		this.element.removeAttr( "role" );
-
-		if ( this.icon ) {
-			this.icon.remove();
-		}
-		if ( this.iconSpace ) {
-			this.iconSpace.remove();
-		}
-		if ( !this.hasTitle ) {
-			this.element.removeAttr( "title" );
-		}
-	},
-
-	_attachIconSpace: function( iconPosition ) {
-		this.icon[ /^(?:end|bottom)/.test( iconPosition ) ? "before" : "after" ]( this.iconSpace );
-	},
-
-	_attachIcon: function( iconPosition ) {
-		this.element[ /^(?:end|bottom)/.test( iconPosition ) ? "append" : "prepend" ]( this.icon );
-	},
-
-	_setOptions: function( options ) {
-		var newShowLabel = options.showLabel === undefined ?
-				this.options.showLabel :
-				options.showLabel,
-			newIcon = options.icon === undefined ? this.options.icon : options.icon;
-
-		if ( !newShowLabel && !newIcon ) {
-			options.showLabel = true;
-		}
-		this._super( options );
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "icon" ) {
-			if ( value ) {
-				this._updateIcon( key, value );
-			} else if ( this.icon ) {
-				this.icon.remove();
-				if ( this.iconSpace ) {
-					this.iconSpace.remove();
-				}
-			}
-		}
-
-		if ( key === "iconPosition" ) {
-			this._updateIcon( key, value );
-		}
-
-		// Make sure we can't end up with a button that has neither text nor icon
-		if ( key === "showLabel" ) {
-				this._toggleClass( "ui-button-icon-only", null, !value );
-				this._updateTooltip();
-		}
-
-		if ( key === "label" ) {
-			if ( this.isInput ) {
-				this.element.val( value );
-			} else {
-
-				// If there is an icon, append it, else nothing then append the value
-				// this avoids removal of the icon when setting label text
-				this.element.html( value );
-				if ( this.icon ) {
-					this._attachIcon( this.options.iconPosition );
-					this._attachIconSpace( this.options.iconPosition );
-				}
-			}
-		}
-
-		this._super( key, value );
-
-		if ( key === "disabled" ) {
-			this._toggleClass( null, "ui-state-disabled", value );
-			this.element[ 0 ].disabled = value;
-			if ( value ) {
-				this.element.blur();
-			}
-		}
-	},
-
-	refresh: function() {
-
-		// Make sure to only check disabled if its an element that supports this otherwise
-		// check for the disabled class to determine state
-		var isDisabled = this.element.is( "input, button" ) ?
-			this.element[ 0 ].disabled : this.element.hasClass( "ui-button-disabled" );
-
-		if ( isDisabled !== this.options.disabled ) {
-			this._setOptions( { disabled: isDisabled } );
-		}
-
-		this._updateTooltip();
-	}
-} );
-
-// DEPRECATED
-if ( $.uiBackCompat !== false ) {
-
-	// Text and Icons options
-	$.widget( "ui.button", $.ui.button, {
-		options: {
-			text: true,
-			icons: {
-				primary: null,
-				secondary: null
-			}
-		},
-
-		_create: function() {
-			if ( this.options.showLabel && !this.options.text ) {
-				this.options.showLabel = this.options.text;
-			}
-			if ( !this.options.showLabel && this.options.text ) {
-				this.options.text = this.options.showLabel;
-			}
-			if ( !this.options.icon && ( this.options.icons.primary ||
-					this.options.icons.secondary ) ) {
-				if ( this.options.icons.primary ) {
-					this.options.icon = this.options.icons.primary;
-				} else {
-					this.options.icon = this.options.icons.secondary;
-					this.options.iconPosition = "end";
-				}
-			} else if ( this.options.icon ) {
-				this.options.icons.primary = this.options.icon;
-			}
-			this._super();
-		},
-
-		_setOption: function( key, value ) {
-			if ( key === "text" ) {
-				this._super( "showLabel", value );
-				return;
-			}
-			if ( key === "showLabel" ) {
-				this.options.text = value;
-			}
-			if ( key === "icon" ) {
-				this.options.icons.primary = value;
-			}
-			if ( key === "icons" ) {
-				if ( value.primary ) {
-					this._super( "icon", value.primary );
-					this._super( "iconPosition", "beginning" );
-				} else if ( value.secondary ) {
-					this._super( "icon", value.secondary );
-					this._super( "iconPosition", "end" );
-				}
-			}
-			this._superApply( arguments );
-		}
-	} );
-
-	$.fn.button = ( function( orig ) {
-		return function() {
-			if ( !this.length || ( this.length && this[ 0 ].tagName !== "INPUT" ) ||
-					( this.length && this[ 0 ].tagName === "INPUT" && (
-						this.attr( "type" ) !== "checkbox" && this.attr( "type" ) !== "radio"
-					) ) ) {
-				return orig.apply( this, arguments );
-			}
-			if ( !$.ui.checkboxradio ) {
-				$.error( "Checkboxradio widget missing" );
-			}
-			if ( arguments.length === 0 ) {
-				return this.checkboxradio( {
-					"icon": false
-				} );
-			}
-			return this.checkboxradio.apply( this, arguments );
-		};
-	} )( $.fn.button );
-
-	$.fn.buttonset = function() {
-		if ( !$.ui.controlgroup ) {
-			$.error( "Controlgroup widget missing" );
-		}
-		if ( arguments[ 0 ] === "option" && arguments[ 1 ] === "items" && arguments[ 2 ] ) {
-			return this.controlgroup.apply( this,
-				[ arguments[ 0 ], "items.button", arguments[ 2 ] ] );
-		}
-		if ( arguments[ 0 ] === "option" && arguments[ 1 ] === "items" ) {
-			return this.controlgroup.apply( this, [ arguments[ 0 ], "items.button" ] );
-		}
-		if ( typeof arguments[ 0 ] === "object" && arguments[ 0 ].items ) {
-			arguments[ 0 ].items = {
-				button: arguments[ 0 ].items
-			};
-		}
-		return this.controlgroup.apply( this, arguments );
-	};
-}
-
-var widgetsButton = $.ui.button;
-
-
-// jscs:disable maximumLineLength
-/* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
-/*!
- * jQuery UI Datepicker 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Datepicker
-//>>group: Widgets
-//>>description: Displays a calendar from an input or inline for selecting dates.
-//>>docs: http://api.jqueryui.com/datepicker/
-//>>demos: http://jqueryui.com/datepicker/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/datepicker.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-$.extend( $.ui, { datepicker: { version: "1.12.1" } } );
-
-var datepicker_instActive;
-
-function datepicker_getZindex( elem ) {
-	var position, value;
-	while ( elem.length && elem[ 0 ] !== document ) {
-
-		// Ignore z-index if position is set to a value where z-index is ignored by the browser
-		// This makes behavior of this function consistent across browsers
-		// WebKit always returns auto if the element is positioned
-		position = elem.css( "position" );
-		if ( position === "absolute" || position === "relative" || position === "fixed" ) {
-
-			// IE returns 0 when zIndex is not specified
-			// other browsers return a string
-			// we ignore the case of nested elements with an explicit value of 0
-			// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
-			value = parseInt( elem.css( "zIndex" ), 10 );
-			if ( !isNaN( value ) && value !== 0 ) {
-				return value;
-			}
-		}
-		elem = elem.parent();
-	}
-
-	return 0;
-}
-/* Date picker manager.
-   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
-   Settings for (groups of) date pickers are maintained in an instance object,
-   allowing multiple different settings on the same page. */
-
-function Datepicker() {
-	this._curInst = null; // The current instance in use
-	this._keyEvent = false; // If the last event was a key event
-	this._disabledInputs = []; // List of date picker inputs that have been disabled
-	this._datepickerShowing = false; // True if the popup picker is showing , false if not
-	this._inDialog = false; // True if showing within a "dialog", false if not
-	this._mainDivId = "ui-datepicker-div"; // The ID of the main datepicker division
-	this._inlineClass = "ui-datepicker-inline"; // The name of the inline marker class
-	this._appendClass = "ui-datepicker-append"; // The name of the append marker class
-	this._triggerClass = "ui-datepicker-trigger"; // The name of the trigger marker class
-	this._dialogClass = "ui-datepicker-dialog"; // The name of the dialog marker class
-	this._disableClass = "ui-datepicker-disabled"; // The name of the disabled covering marker class
-	this._unselectableClass = "ui-datepicker-unselectable"; // The name of the unselectable cell marker class
-	this._currentClass = "ui-datepicker-current-day"; // The name of the current day marker class
-	this._dayOverClass = "ui-datepicker-days-cell-over"; // The name of the day hover marker class
-	this.regional = []; // Available regional settings, indexed by language code
-	this.regional[ "" ] = { // Default regional settings
-		closeText: "Done", // Display text for close link
-		prevText: "Prev", // Display text for previous month link
-		nextText: "Next", // Display text for next month link
-		currentText: "Today", // Display text for current month link
-		monthNames: [ "January","February","March","April","May","June",
-			"July","August","September","October","November","December" ], // Names of months for drop-down and formatting
-		monthNamesShort: [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ], // For formatting
-		dayNames: [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ], // For formatting
-		dayNamesShort: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ], // For formatting
-		dayNamesMin: [ "Su","Mo","Tu","We","Th","Fr","Sa" ], // Column headings for days starting at Sunday
-		weekHeader: "Wk", // Column header for week of the year
-		dateFormat: "mm/dd/yy", // See format options on parseDate
-		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
-		isRTL: false, // True if right-to-left language, false if left-to-right
-		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
-		yearSuffix: "" // Additional text to append to the year in the month headers
-	};
-	this._defaults = { // Global defaults for all the date picker instances
-		showOn: "focus", // "focus" for popup on focus,
-			// "button" for trigger button, or "both" for either
-		showAnim: "fadeIn", // Name of jQuery animation for popup
-		showOptions: {}, // Options for enhanced animations
-		defaultDate: null, // Used when field is blank: actual date,
-			// +/-number for offset from today, null for today
-		appendText: "", // Display text following the input box, e.g. showing the format
-		buttonText: "...", // Text for trigger button
-		buttonImage: "", // URL for trigger button image
-		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
-		hideIfNoPrevNext: false, // True to hide next/previous month links
-			// if not applicable, false to just disable them
-		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
-		gotoCurrent: false, // True if today link goes back to current selection instead
-		changeMonth: false, // True if month can be selected directly, false if only prev/next
-		changeYear: false, // True if year can be selected directly, false if only prev/next
-		yearRange: "c-10:c+10", // Range of years to display in drop-down,
-			// either relative to today's year (-nn:+nn), relative to currently displayed year
-			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
-		showOtherMonths: false, // True to show dates in other months, false to leave blank
-		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
-		showWeek: false, // True to show week of the year, false to not show it
-		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
-			// takes a Date and returns the number of the week for it
-		shortYearCutoff: "+10", // Short year values < this are in the current century,
-			// > this are in the previous century,
-			// string value starting with "+" for current year + value
-		minDate: null, // The earliest selectable date, or null for no limit
-		maxDate: null, // The latest selectable date, or null for no limit
-		duration: "fast", // Duration of display/closure
-		beforeShowDay: null, // Function that takes a date and returns an array with
-			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or "",
-			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
-		beforeShow: null, // Function that takes an input field and
-			// returns a set of custom settings for the date picker
-		onSelect: null, // Define a callback function when a date is selected
-		onChangeMonthYear: null, // Define a callback function when the month or year is changed
-		onClose: null, // Define a callback function when the datepicker is closed
-		numberOfMonths: 1, // Number of months to show at a time
-		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
-		stepMonths: 1, // Number of months to step back/forward
-		stepBigMonths: 12, // Number of months to step back/forward for the big links
-		altField: "", // Selector for an alternate field to store selected dates into
-		altFormat: "", // The date format to use for the alternate field
-		constrainInput: true, // The input is constrained by the current date format
-		showButtonPanel: false, // True to show button panel, false to not show it
-		autoSize: false, // True to size the input for the date format, false to leave as is
-		disabled: false // The initial disabled state
-	};
-	$.extend( this._defaults, this.regional[ "" ] );
-	this.regional.en = $.extend( true, {}, this.regional[ "" ] );
-	this.regional[ "en-US" ] = $.extend( true, {}, this.regional.en );
-	this.dpDiv = datepicker_bindHover( $( "<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>" ) );
-}
-
-$.extend( Datepicker.prototype, {
-	/* Class name added to elements to indicate already configured with a date picker. */
-	markerClassName: "hasDatepicker",
-
-	//Keep track of the maximum number of rows displayed (see #7043)
-	maxRows: 4,
-
-	// TODO rename to "widget" when switching to widget factory
-	_widgetDatepicker: function() {
-		return this.dpDiv;
-	},
-
-	/* Override the default settings for all instances of the date picker.
-	 * @param  settings  object - the new settings to use as defaults (anonymous object)
-	 * @return the manager object
-	 */
-	setDefaults: function( settings ) {
-		datepicker_extendRemove( this._defaults, settings || {} );
-		return this;
-	},
-
-	/* Attach the date picker to a jQuery selection.
-	 * @param  target	element - the target input field or division or span
-	 * @param  settings  object - the new settings to use for this date picker instance (anonymous)
-	 */
-	_attachDatepicker: function( target, settings ) {
-		var nodeName, inline, inst;
-		nodeName = target.nodeName.toLowerCase();
-		inline = ( nodeName === "div" || nodeName === "span" );
-		if ( !target.id ) {
-			this.uuid += 1;
-			target.id = "dp" + this.uuid;
-		}
-		inst = this._newInst( $( target ), inline );
-		inst.settings = $.extend( {}, settings || {} );
-		if ( nodeName === "input" ) {
-			this._connectDatepicker( target, inst );
-		} else if ( inline ) {
-			this._inlineDatepicker( target, inst );
-		}
-	},
-
-	/* Create a new instance object. */
-	_newInst: function( target, inline ) {
-		var id = target[ 0 ].id.replace( /([^A-Za-z0-9_\-])/g, "\\\\$1" ); // escape jQuery meta chars
-		return { id: id, input: target, // associated target
-			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
-			drawMonth: 0, drawYear: 0, // month being drawn
-			inline: inline, // is datepicker inline or not
-			dpDiv: ( !inline ? this.dpDiv : // presentation div
-			datepicker_bindHover( $( "<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>" ) ) ) };
-	},
-
-	/* Attach the date picker to an input field. */
-	_connectDatepicker: function( target, inst ) {
-		var input = $( target );
-		inst.append = $( [] );
-		inst.trigger = $( [] );
-		if ( input.hasClass( this.markerClassName ) ) {
-			return;
-		}
-		this._attachments( input, inst );
-		input.addClass( this.markerClassName ).on( "keydown", this._doKeyDown ).
-			on( "keypress", this._doKeyPress ).on( "keyup", this._doKeyUp );
-		this._autoSize( inst );
-		$.data( target, "datepicker", inst );
-
-		//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
-		if ( inst.settings.disabled ) {
-			this._disableDatepicker( target );
-		}
-	},
-
-	/* Make attachments based on settings. */
-	_attachments: function( input, inst ) {
-		var showOn, buttonText, buttonImage,
-			appendText = this._get( inst, "appendText" ),
-			isRTL = this._get( inst, "isRTL" );
-
-		if ( inst.append ) {
-			inst.append.remove();
-		}
-		if ( appendText ) {
-			inst.append = $( "<span class='" + this._appendClass + "'>" + appendText + "</span>" );
-			input[ isRTL ? "before" : "after" ]( inst.append );
-		}
-
-		input.off( "focus", this._showDatepicker );
-
-		if ( inst.trigger ) {
-			inst.trigger.remove();
-		}
-
-		showOn = this._get( inst, "showOn" );
-		if ( showOn === "focus" || showOn === "both" ) { // pop-up date picker when in the marked field
-			input.on( "focus", this._showDatepicker );
-		}
-		if ( showOn === "button" || showOn === "both" ) { // pop-up date picker when button clicked
-			buttonText = this._get( inst, "buttonText" );
-			buttonImage = this._get( inst, "buttonImage" );
-			inst.trigger = $( this._get( inst, "buttonImageOnly" ) ?
-				$( "<img/>" ).addClass( this._triggerClass ).
-					attr( { src: buttonImage, alt: buttonText, title: buttonText } ) :
-				$( "<button type='button'></button>" ).addClass( this._triggerClass ).
-					html( !buttonImage ? buttonText : $( "<img/>" ).attr(
-					{ src:buttonImage, alt:buttonText, title:buttonText } ) ) );
-			input[ isRTL ? "before" : "after" ]( inst.trigger );
-			inst.trigger.on( "click", function() {
-				if ( $.datepicker._datepickerShowing && $.datepicker._lastInput === input[ 0 ] ) {
-					$.datepicker._hideDatepicker();
-				} else if ( $.datepicker._datepickerShowing && $.datepicker._lastInput !== input[ 0 ] ) {
-					$.datepicker._hideDatepicker();
-					$.datepicker._showDatepicker( input[ 0 ] );
-				} else {
-					$.datepicker._showDatepicker( input[ 0 ] );
-				}
-				return false;
-			} );
-		}
-	},
-
-	/* Apply the maximum length for the date format. */
-	_autoSize: function( inst ) {
-		if ( this._get( inst, "autoSize" ) && !inst.inline ) {
-			var findMax, max, maxI, i,
-				date = new Date( 2009, 12 - 1, 20 ), // Ensure double digits
-				dateFormat = this._get( inst, "dateFormat" );
-
-			if ( dateFormat.match( /[DM]/ ) ) {
-				findMax = function( names ) {
-					max = 0;
-					maxI = 0;
-					for ( i = 0; i < names.length; i++ ) {
-						if ( names[ i ].length > max ) {
-							max = names[ i ].length;
-							maxI = i;
-						}
-					}
-					return maxI;
-				};
-				date.setMonth( findMax( this._get( inst, ( dateFormat.match( /MM/ ) ?
-					"monthNames" : "monthNamesShort" ) ) ) );
-				date.setDate( findMax( this._get( inst, ( dateFormat.match( /DD/ ) ?
-					"dayNames" : "dayNamesShort" ) ) ) + 20 - date.getDay() );
-			}
-			inst.input.attr( "size", this._formatDate( inst, date ).length );
-		}
-	},
-
-	/* Attach an inline date picker to a div. */
-	_inlineDatepicker: function( target, inst ) {
-		var divSpan = $( target );
-		if ( divSpan.hasClass( this.markerClassName ) ) {
-			return;
-		}
-		divSpan.addClass( this.markerClassName ).append( inst.dpDiv );
-		$.data( target, "datepicker", inst );
-		this._setDate( inst, this._getDefaultDate( inst ), true );
-		this._updateDatepicker( inst );
-		this._updateAlternate( inst );
-
-		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
-		if ( inst.settings.disabled ) {
-			this._disableDatepicker( target );
-		}
-
-		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
-		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
-		inst.dpDiv.css( "display", "block" );
-	},
-
-	/* Pop-up the date picker in a "dialog" box.
-	 * @param  input element - ignored
-	 * @param  date	string or Date - the initial date to display
-	 * @param  onSelect  function - the function to call when a date is selected
-	 * @param  settings  object - update the dialog date picker instance's settings (anonymous object)
-	 * @param  pos int[2] - coordinates for the dialog's position within the screen or
-	 *					event - with x/y coordinates or
-	 *					leave empty for default (screen centre)
-	 * @return the manager object
-	 */
-	_dialogDatepicker: function( input, date, onSelect, settings, pos ) {
-		var id, browserWidth, browserHeight, scrollX, scrollY,
-			inst = this._dialogInst; // internal instance
-
-		if ( !inst ) {
-			this.uuid += 1;
-			id = "dp" + this.uuid;
-			this._dialogInput = $( "<input type='text' id='" + id +
-				"' style='position: absolute; top: -100px; width: 0px;'/>" );
-			this._dialogInput.on( "keydown", this._doKeyDown );
-			$( "body" ).append( this._dialogInput );
-			inst = this._dialogInst = this._newInst( this._dialogInput, false );
-			inst.settings = {};
-			$.data( this._dialogInput[ 0 ], "datepicker", inst );
-		}
-		datepicker_extendRemove( inst.settings, settings || {} );
-		date = ( date && date.constructor === Date ? this._formatDate( inst, date ) : date );
-		this._dialogInput.val( date );
-
-		this._pos = ( pos ? ( pos.length ? pos : [ pos.pageX, pos.pageY ] ) : null );
-		if ( !this._pos ) {
-			browserWidth = document.documentElement.clientWidth;
-			browserHeight = document.documentElement.clientHeight;
-			scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
-			scrollY = document.documentElement.scrollTop || document.body.scrollTop;
-			this._pos = // should use actual width/height below
-				[ ( browserWidth / 2 ) - 100 + scrollX, ( browserHeight / 2 ) - 150 + scrollY ];
-		}
-
-		// Move input on screen for focus, but hidden behind dialog
-		this._dialogInput.css( "left", ( this._pos[ 0 ] + 20 ) + "px" ).css( "top", this._pos[ 1 ] + "px" );
-		inst.settings.onSelect = onSelect;
-		this._inDialog = true;
-		this.dpDiv.addClass( this._dialogClass );
-		this._showDatepicker( this._dialogInput[ 0 ] );
-		if ( $.blockUI ) {
-			$.blockUI( this.dpDiv );
-		}
-		$.data( this._dialogInput[ 0 ], "datepicker", inst );
-		return this;
-	},
-
-	/* Detach a datepicker from its control.
-	 * @param  target	element - the target input field or division or span
-	 */
-	_destroyDatepicker: function( target ) {
-		var nodeName,
-			$target = $( target ),
-			inst = $.data( target, "datepicker" );
-
-		if ( !$target.hasClass( this.markerClassName ) ) {
-			return;
-		}
-
-		nodeName = target.nodeName.toLowerCase();
-		$.removeData( target, "datepicker" );
-		if ( nodeName === "input" ) {
-			inst.append.remove();
-			inst.trigger.remove();
-			$target.removeClass( this.markerClassName ).
-				off( "focus", this._showDatepicker ).
-				off( "keydown", this._doKeyDown ).
-				off( "keypress", this._doKeyPress ).
-				off( "keyup", this._doKeyUp );
-		} else if ( nodeName === "div" || nodeName === "span" ) {
-			$target.removeClass( this.markerClassName ).empty();
-		}
-
-		if ( datepicker_instActive === inst ) {
-			datepicker_instActive = null;
-		}
-	},
-
-	/* Enable the date picker to a jQuery selection.
-	 * @param  target	element - the target input field or division or span
-	 */
-	_enableDatepicker: function( target ) {
-		var nodeName, inline,
-			$target = $( target ),
-			inst = $.data( target, "datepicker" );
-
-		if ( !$target.hasClass( this.markerClassName ) ) {
-			return;
-		}
-
-		nodeName = target.nodeName.toLowerCase();
-		if ( nodeName === "input" ) {
-			target.disabled = false;
-			inst.trigger.filter( "button" ).
-				each( function() { this.disabled = false; } ).end().
-				filter( "img" ).css( { opacity: "1.0", cursor: "" } );
-		} else if ( nodeName === "div" || nodeName === "span" ) {
-			inline = $target.children( "." + this._inlineClass );
-			inline.children().removeClass( "ui-state-disabled" );
-			inline.find( "select.ui-datepicker-month, select.ui-datepicker-year" ).
-				prop( "disabled", false );
-		}
-		this._disabledInputs = $.map( this._disabledInputs,
-			function( value ) { return ( value === target ? null : value ); } ); // delete entry
-	},
-
-	/* Disable the date picker to a jQuery selection.
-	 * @param  target	element - the target input field or division or span
-	 */
-	_disableDatepicker: function( target ) {
-		var nodeName, inline,
-			$target = $( target ),
-			inst = $.data( target, "datepicker" );
-
-		if ( !$target.hasClass( this.markerClassName ) ) {
-			return;
-		}
-
-		nodeName = target.nodeName.toLowerCase();
-		if ( nodeName === "input" ) {
-			target.disabled = true;
-			inst.trigger.filter( "button" ).
-				each( function() { this.disabled = true; } ).end().
-				filter( "img" ).css( { opacity: "0.5", cursor: "default" } );
-		} else if ( nodeName === "div" || nodeName === "span" ) {
-			inline = $target.children( "." + this._inlineClass );
-			inline.children().addClass( "ui-state-disabled" );
-			inline.find( "select.ui-datepicker-month, select.ui-datepicker-year" ).
-				prop( "disabled", true );
-		}
-		this._disabledInputs = $.map( this._disabledInputs,
-			function( value ) { return ( value === target ? null : value ); } ); // delete entry
-		this._disabledInputs[ this._disabledInputs.length ] = target;
-	},
-
-	/* Is the first field in a jQuery collection disabled as a datepicker?
-	 * @param  target	element - the target input field or division or span
-	 * @return boolean - true if disabled, false if enabled
-	 */
-	_isDisabledDatepicker: function( target ) {
-		if ( !target ) {
-			return false;
-		}
-		for ( var i = 0; i < this._disabledInputs.length; i++ ) {
-			if ( this._disabledInputs[ i ] === target ) {
-				return true;
-			}
-		}
-		return false;
-	},
-
-	/* Retrieve the instance data for the target control.
-	 * @param  target  element - the target input field or division or span
-	 * @return  object - the associated instance data
-	 * @throws  error if a jQuery problem getting data
-	 */
-	_getInst: function( target ) {
-		try {
-			return $.data( target, "datepicker" );
-		}
-		catch ( err ) {
-			throw "Missing instance data for this datepicker";
-		}
-	},
-
-	/* Update or retrieve the settings for a date picker attached to an input field or division.
-	 * @param  target  element - the target input field or division or span
-	 * @param  name	object - the new settings to update or
-	 *				string - the name of the setting to change or retrieve,
-	 *				when retrieving also "all" for all instance settings or
-	 *				"defaults" for all global defaults
-	 * @param  value   any - the new value for the setting
-	 *				(omit if above is an object or to retrieve a value)
-	 */
-	_optionDatepicker: function( target, name, value ) {
-		var settings, date, minDate, maxDate,
-			inst = this._getInst( target );
-
-		if ( arguments.length === 2 && typeof name === "string" ) {
-			return ( name === "defaults" ? $.extend( {}, $.datepicker._defaults ) :
-				( inst ? ( name === "all" ? $.extend( {}, inst.settings ) :
-				this._get( inst, name ) ) : null ) );
-		}
-
-		settings = name || {};
-		if ( typeof name === "string" ) {
-			settings = {};
-			settings[ name ] = value;
-		}
-
-		if ( inst ) {
-			if ( this._curInst === inst ) {
-				this._hideDatepicker();
-			}
-
-			date = this._getDateDatepicker( target, true );
-			minDate = this._getMinMaxDate( inst, "min" );
-			maxDate = this._getMinMaxDate( inst, "max" );
-			datepicker_extendRemove( inst.settings, settings );
-
-			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
-			if ( minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined ) {
-				inst.settings.minDate = this._formatDate( inst, minDate );
-			}
-			if ( maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined ) {
-				inst.settings.maxDate = this._formatDate( inst, maxDate );
-			}
-			if ( "disabled" in settings ) {
-				if ( settings.disabled ) {
-					this._disableDatepicker( target );
-				} else {
-					this._enableDatepicker( target );
-				}
-			}
-			this._attachments( $( target ), inst );
-			this._autoSize( inst );
-			this._setDate( inst, date );
-			this._updateAlternate( inst );
-			this._updateDatepicker( inst );
-		}
-	},
-
-	// Change method deprecated
-	_changeDatepicker: function( target, name, value ) {
-		this._optionDatepicker( target, name, value );
-	},
-
-	/* Redraw the date picker attached to an input field or division.
-	 * @param  target  element - the target input field or division or span
-	 */
-	_refreshDatepicker: function( target ) {
-		var inst = this._getInst( target );
-		if ( inst ) {
-			this._updateDatepicker( inst );
-		}
-	},
-
-	/* Set the dates for a jQuery selection.
-	 * @param  target element - the target input field or division or span
-	 * @param  date	Date - the new date
-	 */
-	_setDateDatepicker: function( target, date ) {
-		var inst = this._getInst( target );
-		if ( inst ) {
-			this._setDate( inst, date );
-			this._updateDatepicker( inst );
-			this._updateAlternate( inst );
-		}
-	},
-
-	/* Get the date(s) for the first entry in a jQuery selection.
-	 * @param  target element - the target input field or division or span
-	 * @param  noDefault boolean - true if no default date is to be used
-	 * @return Date - the current date
-	 */
-	_getDateDatepicker: function( target, noDefault ) {
-		var inst = this._getInst( target );
-		if ( inst && !inst.inline ) {
-			this._setDateFromField( inst, noDefault );
-		}
-		return ( inst ? this._getDate( inst ) : null );
-	},
-
-	/* Handle keystrokes. */
-	_doKeyDown: function( event ) {
-		var onSelect, dateStr, sel,
-			inst = $.datepicker._getInst( event.target ),
-			handled = true,
-			isRTL = inst.dpDiv.is( ".ui-datepicker-rtl" );
-
-		inst._keyEvent = true;
-		if ( $.datepicker._datepickerShowing ) {
-			switch ( event.keyCode ) {
-				case 9: $.datepicker._hideDatepicker();
-						handled = false;
-						break; // hide on tab out
-				case 13: sel = $( "td." + $.datepicker._dayOverClass + ":not(." +
-									$.datepicker._currentClass + ")", inst.dpDiv );
-						if ( sel[ 0 ] ) {
-							$.datepicker._selectDay( event.target, inst.selectedMonth, inst.selectedYear, sel[ 0 ] );
-						}
-
-						onSelect = $.datepicker._get( inst, "onSelect" );
-						if ( onSelect ) {
-							dateStr = $.datepicker._formatDate( inst );
-
-							// Trigger custom callback
-							onSelect.apply( ( inst.input ? inst.input[ 0 ] : null ), [ dateStr, inst ] );
-						} else {
-							$.datepicker._hideDatepicker();
-						}
-
-						return false; // don't submit the form
-				case 27: $.datepicker._hideDatepicker();
-						break; // hide on escape
-				case 33: $.datepicker._adjustDate( event.target, ( event.ctrlKey ?
-							-$.datepicker._get( inst, "stepBigMonths" ) :
-							-$.datepicker._get( inst, "stepMonths" ) ), "M" );
-						break; // previous month/year on page up/+ ctrl
-				case 34: $.datepicker._adjustDate( event.target, ( event.ctrlKey ?
-							+$.datepicker._get( inst, "stepBigMonths" ) :
-							+$.datepicker._get( inst, "stepMonths" ) ), "M" );
-						break; // next month/year on page down/+ ctrl
-				case 35: if ( event.ctrlKey || event.metaKey ) {
-							$.datepicker._clearDate( event.target );
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // clear on ctrl or command +end
-				case 36: if ( event.ctrlKey || event.metaKey ) {
-							$.datepicker._gotoToday( event.target );
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // current on ctrl or command +home
-				case 37: if ( event.ctrlKey || event.metaKey ) {
-							$.datepicker._adjustDate( event.target, ( isRTL ? +1 : -1 ), "D" );
-						}
-						handled = event.ctrlKey || event.metaKey;
-
-						// -1 day on ctrl or command +left
-						if ( event.originalEvent.altKey ) {
-							$.datepicker._adjustDate( event.target, ( event.ctrlKey ?
-								-$.datepicker._get( inst, "stepBigMonths" ) :
-								-$.datepicker._get( inst, "stepMonths" ) ), "M" );
-						}
-
-						// next month/year on alt +left on Mac
-						break;
-				case 38: if ( event.ctrlKey || event.metaKey ) {
-							$.datepicker._adjustDate( event.target, -7, "D" );
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // -1 week on ctrl or command +up
-				case 39: if ( event.ctrlKey || event.metaKey ) {
-							$.datepicker._adjustDate( event.target, ( isRTL ? -1 : +1 ), "D" );
-						}
-						handled = event.ctrlKey || event.metaKey;
-
-						// +1 day on ctrl or command +right
-						if ( event.originalEvent.altKey ) {
-							$.datepicker._adjustDate( event.target, ( event.ctrlKey ?
-								+$.datepicker._get( inst, "stepBigMonths" ) :
-								+$.datepicker._get( inst, "stepMonths" ) ), "M" );
-						}
-
-						// next month/year on alt +right
-						break;
-				case 40: if ( event.ctrlKey || event.metaKey ) {
-							$.datepicker._adjustDate( event.target, +7, "D" );
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // +1 week on ctrl or command +down
-				default: handled = false;
-			}
-		} else if ( event.keyCode === 36 && event.ctrlKey ) { // display the date picker on ctrl+home
-			$.datepicker._showDatepicker( this );
-		} else {
-			handled = false;
-		}
-
-		if ( handled ) {
-			event.preventDefault();
-			event.stopPropagation();
-		}
-	},
-
-	/* Filter entered characters - based on date format. */
-	_doKeyPress: function( event ) {
-		var chars, chr,
-			inst = $.datepicker._getInst( event.target );
-
-		if ( $.datepicker._get( inst, "constrainInput" ) ) {
-			chars = $.datepicker._possibleChars( $.datepicker._get( inst, "dateFormat" ) );
-			chr = String.fromCharCode( event.charCode == null ? event.keyCode : event.charCode );
-			return event.ctrlKey || event.metaKey || ( chr < " " || !chars || chars.indexOf( chr ) > -1 );
-		}
-	},
-
-	/* Synchronise manual entry and field/alternate field. */
-	_doKeyUp: function( event ) {
-		var date,
-			inst = $.datepicker._getInst( event.target );
-
-		if ( inst.input.val() !== inst.lastVal ) {
-			try {
-				date = $.datepicker.parseDate( $.datepicker._get( inst, "dateFormat" ),
-					( inst.input ? inst.input.val() : null ),
-					$.datepicker._getFormatConfig( inst ) );
-
-				if ( date ) { // only if valid
-					$.datepicker._setDateFromField( inst );
-					$.datepicker._updateAlternate( inst );
-					$.datepicker._updateDatepicker( inst );
-				}
-			}
-			catch ( err ) {
-			}
-		}
-		return true;
-	},
-
-	/* Pop-up the date picker for a given input field.
-	 * If false returned from beforeShow event handler do not show.
-	 * @param  input  element - the input field attached to the date picker or
-	 *					event - if triggered by focus
-	 */
-	_showDatepicker: function( input ) {
-		input = input.target || input;
-		if ( input.nodeName.toLowerCase() !== "input" ) { // find from button/image trigger
-			input = $( "input", input.parentNode )[ 0 ];
-		}
-
-		if ( $.datepicker._isDisabledDatepicker( input ) || $.datepicker._lastInput === input ) { // already here
-			return;
-		}
-
-		var inst, beforeShow, beforeShowSettings, isFixed,
-			offset, showAnim, duration;
-
-		inst = $.datepicker._getInst( input );
-		if ( $.datepicker._curInst && $.datepicker._curInst !== inst ) {
-			$.datepicker._curInst.dpDiv.stop( true, true );
-			if ( inst && $.datepicker._datepickerShowing ) {
-				$.datepicker._hideDatepicker( $.datepicker._curInst.input[ 0 ] );
-			}
-		}
-
-		beforeShow = $.datepicker._get( inst, "beforeShow" );
-		beforeShowSettings = beforeShow ? beforeShow.apply( input, [ input, inst ] ) : {};
-		if ( beforeShowSettings === false ) {
-			return;
-		}
-		datepicker_extendRemove( inst.settings, beforeShowSettings );
-
-		inst.lastVal = null;
-		$.datepicker._lastInput = input;
-		$.datepicker._setDateFromField( inst );
-
-		if ( $.datepicker._inDialog ) { // hide cursor
-			input.value = "";
-		}
-		if ( !$.datepicker._pos ) { // position below input
-			$.datepicker._pos = $.datepicker._findPos( input );
-			$.datepicker._pos[ 1 ] += input.offsetHeight; // add the height
-		}
-
-		isFixed = false;
-		$( input ).parents().each( function() {
-			isFixed |= $( this ).css( "position" ) === "fixed";
-			return !isFixed;
-		} );
-
-		offset = { left: $.datepicker._pos[ 0 ], top: $.datepicker._pos[ 1 ] };
-		$.datepicker._pos = null;
-
-		//to avoid flashes on Firefox
-		inst.dpDiv.empty();
-
-		// determine sizing offscreen
-		inst.dpDiv.css( { position: "absolute", display: "block", top: "-1000px" } );
-		$.datepicker._updateDatepicker( inst );
-
-		// fix width for dynamic number of date pickers
-		// and adjust position before showing
-		offset = $.datepicker._checkOffset( inst, offset, isFixed );
-		inst.dpDiv.css( { position: ( $.datepicker._inDialog && $.blockUI ?
-			"static" : ( isFixed ? "fixed" : "absolute" ) ), display: "none",
-			left: offset.left + "px", top: offset.top + "px" } );
-
-		if ( !inst.inline ) {
-			showAnim = $.datepicker._get( inst, "showAnim" );
-			duration = $.datepicker._get( inst, "duration" );
-			inst.dpDiv.css( "z-index", datepicker_getZindex( $( input ) ) + 1 );
-			$.datepicker._datepickerShowing = true;
-
-			if ( $.effects && $.effects.effect[ showAnim ] ) {
-				inst.dpDiv.show( showAnim, $.datepicker._get( inst, "showOptions" ), duration );
-			} else {
-				inst.dpDiv[ showAnim || "show" ]( showAnim ? duration : null );
-			}
-
-			if ( $.datepicker._shouldFocusInput( inst ) ) {
-				inst.input.trigger( "focus" );
-			}
-
-			$.datepicker._curInst = inst;
-		}
-	},
-
-	/* Generate the date picker content. */
-	_updateDatepicker: function( inst ) {
-		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
-		datepicker_instActive = inst; // for delegate hover events
-		inst.dpDiv.empty().append( this._generateHTML( inst ) );
-		this._attachHandlers( inst );
-
-		var origyearshtml,
-			numMonths = this._getNumberOfMonths( inst ),
-			cols = numMonths[ 1 ],
-			width = 17,
-			activeCell = inst.dpDiv.find( "." + this._dayOverClass + " a" );
-
-		if ( activeCell.length > 0 ) {
-			datepicker_handleMouseover.apply( activeCell.get( 0 ) );
-		}
-
-		inst.dpDiv.removeClass( "ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4" ).width( "" );
-		if ( cols > 1 ) {
-			inst.dpDiv.addClass( "ui-datepicker-multi-" + cols ).css( "width", ( width * cols ) + "em" );
-		}
-		inst.dpDiv[ ( numMonths[ 0 ] !== 1 || numMonths[ 1 ] !== 1 ? "add" : "remove" ) +
-			"Class" ]( "ui-datepicker-multi" );
-		inst.dpDiv[ ( this._get( inst, "isRTL" ) ? "add" : "remove" ) +
-			"Class" ]( "ui-datepicker-rtl" );
-
-		if ( inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
-			inst.input.trigger( "focus" );
-		}
-
-		// Deffered render of the years select (to avoid flashes on Firefox)
-		if ( inst.yearshtml ) {
-			origyearshtml = inst.yearshtml;
-			setTimeout( function() {
-
-				//assure that inst.yearshtml didn't change.
-				if ( origyearshtml === inst.yearshtml && inst.yearshtml ) {
-					inst.dpDiv.find( "select.ui-datepicker-year:first" ).replaceWith( inst.yearshtml );
-				}
-				origyearshtml = inst.yearshtml = null;
-			}, 0 );
-		}
-	},
-
-	// #6694 - don't focus the input if it's already focused
-	// this breaks the change event in IE
-	// Support: IE and jQuery <1.9
-	_shouldFocusInput: function( inst ) {
-		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
-	},
-
-	/* Check positioning to remain on screen. */
-	_checkOffset: function( inst, offset, isFixed ) {
-		var dpWidth = inst.dpDiv.outerWidth(),
-			dpHeight = inst.dpDiv.outerHeight(),
-			inputWidth = inst.input ? inst.input.outerWidth() : 0,
-			inputHeight = inst.input ? inst.input.outerHeight() : 0,
-			viewWidth = document.documentElement.clientWidth + ( isFixed ? 0 : $( document ).scrollLeft() ),
-			viewHeight = document.documentElement.clientHeight + ( isFixed ? 0 : $( document ).scrollTop() );
-
-		offset.left -= ( this._get( inst, "isRTL" ) ? ( dpWidth - inputWidth ) : 0 );
-		offset.left -= ( isFixed && offset.left === inst.input.offset().left ) ? $( document ).scrollLeft() : 0;
-		offset.top -= ( isFixed && offset.top === ( inst.input.offset().top + inputHeight ) ) ? $( document ).scrollTop() : 0;
-
-		// Now check if datepicker is showing outside window viewport - move to a better place if so.
-		offset.left -= Math.min( offset.left, ( offset.left + dpWidth > viewWidth && viewWidth > dpWidth ) ?
-			Math.abs( offset.left + dpWidth - viewWidth ) : 0 );
-		offset.top -= Math.min( offset.top, ( offset.top + dpHeight > viewHeight && viewHeight > dpHeight ) ?
-			Math.abs( dpHeight + inputHeight ) : 0 );
-
-		return offset;
-	},
-
-	/* Find an object's position on the screen. */
-	_findPos: function( obj ) {
-		var position,
-			inst = this._getInst( obj ),
-			isRTL = this._get( inst, "isRTL" );
-
-		while ( obj && ( obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden( obj ) ) ) {
-			obj = obj[ isRTL ? "previousSibling" : "nextSibling" ];
-		}
-
-		position = $( obj ).offset();
-		return [ position.left, position.top ];
-	},
-
-	/* Hide the date picker from view.
-	 * @param  input  element - the input field attached to the date picker
-	 */
-	_hideDatepicker: function( input ) {
-		var showAnim, duration, postProcess, onClose,
-			inst = this._curInst;
-
-		if ( !inst || ( input && inst !== $.data( input, "datepicker" ) ) ) {
-			return;
-		}
-
-		if ( this._datepickerShowing ) {
-			showAnim = this._get( inst, "showAnim" );
-			duration = this._get( inst, "duration" );
-			postProcess = function() {
-				$.datepicker._tidyDialog( inst );
-			};
-
-			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
-			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
-				inst.dpDiv.hide( showAnim, $.datepicker._get( inst, "showOptions" ), duration, postProcess );
-			} else {
-				inst.dpDiv[ ( showAnim === "slideDown" ? "slideUp" :
-					( showAnim === "fadeIn" ? "fadeOut" : "hide" ) ) ]( ( showAnim ? duration : null ), postProcess );
-			}
-
-			if ( !showAnim ) {
-				postProcess();
-			}
-			this._datepickerShowing = false;
-
-			onClose = this._get( inst, "onClose" );
-			if ( onClose ) {
-				onClose.apply( ( inst.input ? inst.input[ 0 ] : null ), [ ( inst.input ? inst.input.val() : "" ), inst ] );
-			}
-
-			this._lastInput = null;
-			if ( this._inDialog ) {
-				this._dialogInput.css( { position: "absolute", left: "0", top: "-100px" } );
-				if ( $.blockUI ) {
-					$.unblockUI();
-					$( "body" ).append( this.dpDiv );
-				}
-			}
-			this._inDialog = false;
-		}
-	},
-
-	/* Tidy up after a dialog display. */
-	_tidyDialog: function( inst ) {
-		inst.dpDiv.removeClass( this._dialogClass ).off( ".ui-datepicker-calendar" );
-	},
-
-	/* Close date picker if clicked elsewhere. */
-	_checkExternalClick: function( event ) {
-		if ( !$.datepicker._curInst ) {
-			return;
-		}
-
-		var $target = $( event.target ),
-			inst = $.datepicker._getInst( $target[ 0 ] );
-
-		if ( ( ( $target[ 0 ].id !== $.datepicker._mainDivId &&
-				$target.parents( "#" + $.datepicker._mainDivId ).length === 0 &&
-				!$target.hasClass( $.datepicker.markerClassName ) &&
-				!$target.closest( "." + $.datepicker._triggerClass ).length &&
-				$.datepicker._datepickerShowing && !( $.datepicker._inDialog && $.blockUI ) ) ) ||
-			( $target.hasClass( $.datepicker.markerClassName ) && $.datepicker._curInst !== inst ) ) {
-				$.datepicker._hideDatepicker();
-		}
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustDate: function( id, offset, period ) {
-		var target = $( id ),
-			inst = this._getInst( target[ 0 ] );
-
-		if ( this._isDisabledDatepicker( target[ 0 ] ) ) {
-			return;
-		}
-		this._adjustInstDate( inst, offset +
-			( period === "M" ? this._get( inst, "showCurrentAtPos" ) : 0 ), // undo positioning
-			period );
-		this._updateDatepicker( inst );
-	},
-
-	/* Action for current link. */
-	_gotoToday: function( id ) {
-		var date,
-			target = $( id ),
-			inst = this._getInst( target[ 0 ] );
-
-		if ( this._get( inst, "gotoCurrent" ) && inst.currentDay ) {
-			inst.selectedDay = inst.currentDay;
-			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
-			inst.drawYear = inst.selectedYear = inst.currentYear;
-		} else {
-			date = new Date();
-			inst.selectedDay = date.getDate();
-			inst.drawMonth = inst.selectedMonth = date.getMonth();
-			inst.drawYear = inst.selectedYear = date.getFullYear();
-		}
-		this._notifyChange( inst );
-		this._adjustDate( target );
-	},
-
-	/* Action for selecting a new month/year. */
-	_selectMonthYear: function( id, select, period ) {
-		var target = $( id ),
-			inst = this._getInst( target[ 0 ] );
-
-		inst[ "selected" + ( period === "M" ? "Month" : "Year" ) ] =
-		inst[ "draw" + ( period === "M" ? "Month" : "Year" ) ] =
-			parseInt( select.options[ select.selectedIndex ].value, 10 );
-
-		this._notifyChange( inst );
-		this._adjustDate( target );
-	},
-
-	/* Action for selecting a day. */
-	_selectDay: function( id, month, year, td ) {
-		var inst,
-			target = $( id );
-
-		if ( $( td ).hasClass( this._unselectableClass ) || this._isDisabledDatepicker( target[ 0 ] ) ) {
-			return;
-		}
-
-		inst = this._getInst( target[ 0 ] );
-		inst.selectedDay = inst.currentDay = $( "a", td ).html();
-		inst.selectedMonth = inst.currentMonth = month;
-		inst.selectedYear = inst.currentYear = year;
-		this._selectDate( id, this._formatDate( inst,
-			inst.currentDay, inst.currentMonth, inst.currentYear ) );
-	},
-
-	/* Erase the input field and hide the date picker. */
-	_clearDate: function( id ) {
-		var target = $( id );
-		this._selectDate( target, "" );
-	},
-
-	/* Update the input field with the selected date. */
-	_selectDate: function( id, dateStr ) {
-		var onSelect,
-			target = $( id ),
-			inst = this._getInst( target[ 0 ] );
-
-		dateStr = ( dateStr != null ? dateStr : this._formatDate( inst ) );
-		if ( inst.input ) {
-			inst.input.val( dateStr );
-		}
-		this._updateAlternate( inst );
-
-		onSelect = this._get( inst, "onSelect" );
-		if ( onSelect ) {
-			onSelect.apply( ( inst.input ? inst.input[ 0 ] : null ), [ dateStr, inst ] );  // trigger custom callback
-		} else if ( inst.input ) {
-			inst.input.trigger( "change" ); // fire the change event
-		}
-
-		if ( inst.inline ) {
-			this._updateDatepicker( inst );
-		} else {
-			this._hideDatepicker();
-			this._lastInput = inst.input[ 0 ];
-			if ( typeof( inst.input[ 0 ] ) !== "object" ) {
-				inst.input.trigger( "focus" ); // restore focus
-			}
-			this._lastInput = null;
-		}
-	},
-
-	/* Update any alternate field to synchronise with the main field. */
-	_updateAlternate: function( inst ) {
-		var altFormat, date, dateStr,
-			altField = this._get( inst, "altField" );
-
-		if ( altField ) { // update alternate field too
-			altFormat = this._get( inst, "altFormat" ) || this._get( inst, "dateFormat" );
-			date = this._getDate( inst );
-			dateStr = this.formatDate( altFormat, date, this._getFormatConfig( inst ) );
-			$( altField ).val( dateStr );
-		}
-	},
-
-	/* Set as beforeShowDay function to prevent selection of weekends.
-	 * @param  date  Date - the date to customise
-	 * @return [boolean, string] - is this date selectable?, what is its CSS class?
-	 */
-	noWeekends: function( date ) {
-		var day = date.getDay();
-		return [ ( day > 0 && day < 6 ), "" ];
-	},
-
-	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
-	 * @param  date  Date - the date to get the week for
-	 * @return  number - the number of the week within the year that contains this date
-	 */
-	iso8601Week: function( date ) {
-		var time,
-			checkDate = new Date( date.getTime() );
-
-		// Find Thursday of this week starting on Monday
-		checkDate.setDate( checkDate.getDate() + 4 - ( checkDate.getDay() || 7 ) );
-
-		time = checkDate.getTime();
-		checkDate.setMonth( 0 ); // Compare with Jan 1
-		checkDate.setDate( 1 );
-		return Math.floor( Math.round( ( time - checkDate ) / 86400000 ) / 7 ) + 1;
-	},
-
-	/* Parse a string value into a date object.
-	 * See formatDate below for the possible formats.
-	 *
-	 * @param  format string - the expected format of the date
-	 * @param  value string - the date in the above format
-	 * @param  settings Object - attributes include:
-	 *					shortYearCutoff  number - the cutoff year for determining the century (optional)
-	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
-	 *					dayNames		string[7] - names of the days from Sunday (optional)
-	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
-	 *					monthNames		string[12] - names of the months (optional)
-	 * @return  Date - the extracted date value or null if value is blank
-	 */
-	parseDate: function( format, value, settings ) {
-		if ( format == null || value == null ) {
-			throw "Invalid arguments";
-		}
-
-		value = ( typeof value === "object" ? value.toString() : value + "" );
-		if ( value === "" ) {
-			return null;
-		}
-
-		var iFormat, dim, extra,
-			iValue = 0,
-			shortYearCutoffTemp = ( settings ? settings.shortYearCutoff : null ) || this._defaults.shortYearCutoff,
-			shortYearCutoff = ( typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
-				new Date().getFullYear() % 100 + parseInt( shortYearCutoffTemp, 10 ) ),
-			dayNamesShort = ( settings ? settings.dayNamesShort : null ) || this._defaults.dayNamesShort,
-			dayNames = ( settings ? settings.dayNames : null ) || this._defaults.dayNames,
-			monthNamesShort = ( settings ? settings.monthNamesShort : null ) || this._defaults.monthNamesShort,
-			monthNames = ( settings ? settings.monthNames : null ) || this._defaults.monthNames,
-			year = -1,
-			month = -1,
-			day = -1,
-			doy = -1,
-			literal = false,
-			date,
-
-			// Check whether a format character is doubled
-			lookAhead = function( match ) {
-				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
-				if ( matches ) {
-					iFormat++;
-				}
-				return matches;
-			},
-
-			// Extract a number from the string value
-			getNumber = function( match ) {
-				var isDoubled = lookAhead( match ),
-					size = ( match === "@" ? 14 : ( match === "!" ? 20 :
-					( match === "y" && isDoubled ? 4 : ( match === "o" ? 3 : 2 ) ) ) ),
-					minSize = ( match === "y" ? size : 1 ),
-					digits = new RegExp( "^\\d{" + minSize + "," + size + "}" ),
-					num = value.substring( iValue ).match( digits );
-				if ( !num ) {
-					throw "Missing number at position " + iValue;
-				}
-				iValue += num[ 0 ].length;
-				return parseInt( num[ 0 ], 10 );
-			},
-
-			// Extract a name from the string value and convert to an index
-			getName = function( match, shortNames, longNames ) {
-				var index = -1,
-					names = $.map( lookAhead( match ) ? longNames : shortNames, function( v, k ) {
-						return [ [ k, v ] ];
-					} ).sort( function( a, b ) {
-						return -( a[ 1 ].length - b[ 1 ].length );
-					} );
-
-				$.each( names, function( i, pair ) {
-					var name = pair[ 1 ];
-					if ( value.substr( iValue, name.length ).toLowerCase() === name.toLowerCase() ) {
-						index = pair[ 0 ];
-						iValue += name.length;
-						return false;
-					}
-				} );
-				if ( index !== -1 ) {
-					return index + 1;
-				} else {
-					throw "Unknown name at position " + iValue;
-				}
-			},
-
-			// Confirm that a literal character matches the string value
-			checkLiteral = function() {
-				if ( value.charAt( iValue ) !== format.charAt( iFormat ) ) {
-					throw "Unexpected literal at position " + iValue;
-				}
-				iValue++;
-			};
-
-		for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
-			if ( literal ) {
-				if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
-					literal = false;
-				} else {
-					checkLiteral();
-				}
-			} else {
-				switch ( format.charAt( iFormat ) ) {
-					case "d":
-						day = getNumber( "d" );
-						break;
-					case "D":
-						getName( "D", dayNamesShort, dayNames );
-						break;
-					case "o":
-						doy = getNumber( "o" );
-						break;
-					case "m":
-						month = getNumber( "m" );
-						break;
-					case "M":
-						month = getName( "M", monthNamesShort, monthNames );
-						break;
-					case "y":
-						year = getNumber( "y" );
-						break;
-					case "@":
-						date = new Date( getNumber( "@" ) );
-						year = date.getFullYear();
-						month = date.getMonth() + 1;
-						day = date.getDate();
-						break;
-					case "!":
-						date = new Date( ( getNumber( "!" ) - this._ticksTo1970 ) / 10000 );
-						year = date.getFullYear();
-						month = date.getMonth() + 1;
-						day = date.getDate();
-						break;
-					case "'":
-						if ( lookAhead( "'" ) ) {
-							checkLiteral();
-						} else {
-							literal = true;
-						}
-						break;
-					default:
-						checkLiteral();
-				}
-			}
-		}
-
-		if ( iValue < value.length ) {
-			extra = value.substr( iValue );
-			if ( !/^\s+/.test( extra ) ) {
-				throw "Extra/unparsed characters found in date: " + extra;
-			}
-		}
-
-		if ( year === -1 ) {
-			year = new Date().getFullYear();
-		} else if ( year < 100 ) {
-			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
-				( year <= shortYearCutoff ? 0 : -100 );
-		}
-
-		if ( doy > -1 ) {
-			month = 1;
-			day = doy;
-			do {
-				dim = this._getDaysInMonth( year, month - 1 );
-				if ( day <= dim ) {
-					break;
-				}
-				month++;
-				day -= dim;
-			} while ( true );
-		}
-
-		date = this._daylightSavingAdjust( new Date( year, month - 1, day ) );
-		if ( date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day ) {
-			throw "Invalid date"; // E.g. 31/02/00
-		}
-		return date;
-	},
-
-	/* Standard date formats. */
-	ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601)
-	COOKIE: "D, dd M yy",
-	ISO_8601: "yy-mm-dd",
-	RFC_822: "D, d M y",
-	RFC_850: "DD, dd-M-y",
-	RFC_1036: "D, d M y",
-	RFC_1123: "D, d M yy",
-	RFC_2822: "D, d M yy",
-	RSS: "D, d M y", // RFC 822
-	TICKS: "!",
-	TIMESTAMP: "@",
-	W3C: "yy-mm-dd", // ISO 8601
-
-	_ticksTo1970: ( ( ( 1970 - 1 ) * 365 + Math.floor( 1970 / 4 ) - Math.floor( 1970 / 100 ) +
-		Math.floor( 1970 / 400 ) ) * 24 * 60 * 60 * 10000000 ),
-
-	/* Format a date object into a string value.
-	 * The format can be combinations of the following:
-	 * d  - day of month (no leading zero)
-	 * dd - day of month (two digit)
-	 * o  - day of year (no leading zeros)
-	 * oo - day of year (three digit)
-	 * D  - day name short
-	 * DD - day name long
-	 * m  - month of year (no leading zero)
-	 * mm - month of year (two digit)
-	 * M  - month name short
-	 * MM - month name long
-	 * y  - year (two digit)
-	 * yy - year (four digit)
-	 * @ - Unix timestamp (ms since 01/01/1970)
-	 * ! - Windows ticks (100ns since 01/01/0001)
-	 * "..." - literal text
-	 * '' - single quote
-	 *
-	 * @param  format string - the desired format of the date
-	 * @param  date Date - the date value to format
-	 * @param  settings Object - attributes include:
-	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
-	 *					dayNames		string[7] - names of the days from Sunday (optional)
-	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
-	 *					monthNames		string[12] - names of the months (optional)
-	 * @return  string - the date in the above format
-	 */
-	formatDate: function( format, date, settings ) {
-		if ( !date ) {
-			return "";
-		}
-
-		var iFormat,
-			dayNamesShort = ( settings ? settings.dayNamesShort : null ) || this._defaults.dayNamesShort,
-			dayNames = ( settings ? settings.dayNames : null ) || this._defaults.dayNames,
-			monthNamesShort = ( settings ? settings.monthNamesShort : null ) || this._defaults.monthNamesShort,
-			monthNames = ( settings ? settings.monthNames : null ) || this._defaults.monthNames,
-
-			// Check whether a format character is doubled
-			lookAhead = function( match ) {
-				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
-				if ( matches ) {
-					iFormat++;
-				}
-				return matches;
-			},
-
-			// Format a number, with leading zero if necessary
-			formatNumber = function( match, value, len ) {
-				var num = "" + value;
-				if ( lookAhead( match ) ) {
-					while ( num.length < len ) {
-						num = "0" + num;
-					}
-				}
-				return num;
-			},
-
-			// Format a name, short or long as requested
-			formatName = function( match, value, shortNames, longNames ) {
-				return ( lookAhead( match ) ? longNames[ value ] : shortNames[ value ] );
-			},
-			output = "",
-			literal = false;
-
-		if ( date ) {
-			for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
-				if ( literal ) {
-					if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
-						literal = false;
-					} else {
-						output += format.charAt( iFormat );
-					}
-				} else {
-					switch ( format.charAt( iFormat ) ) {
-						case "d":
-							output += formatNumber( "d", date.getDate(), 2 );
-							break;
-						case "D":
-							output += formatName( "D", date.getDay(), dayNamesShort, dayNames );
-							break;
-						case "o":
-							output += formatNumber( "o",
-								Math.round( ( new Date( date.getFullYear(), date.getMonth(), date.getDate() ).getTime() - new Date( date.getFullYear(), 0, 0 ).getTime() ) / 86400000 ), 3 );
-							break;
-						case "m":
-							output += formatNumber( "m", date.getMonth() + 1, 2 );
-							break;
-						case "M":
-							output += formatName( "M", date.getMonth(), monthNamesShort, monthNames );
-							break;
-						case "y":
-							output += ( lookAhead( "y" ) ? date.getFullYear() :
-								( date.getFullYear() % 100 < 10 ? "0" : "" ) + date.getFullYear() % 100 );
-							break;
-						case "@":
-							output += date.getTime();
-							break;
-						case "!":
-							output += date.getTime() * 10000 + this._ticksTo1970;
-							break;
-						case "'":
-							if ( lookAhead( "'" ) ) {
-								output += "'";
-							} else {
-								literal = true;
-							}
-							break;
-						default:
-							output += format.charAt( iFormat );
-					}
-				}
-			}
-		}
-		return output;
-	},
-
-	/* Extract all possible characters from the date format. */
-	_possibleChars: function( format ) {
-		var iFormat,
-			chars = "",
-			literal = false,
-
-			// Check whether a format character is doubled
-			lookAhead = function( match ) {
-				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
-				if ( matches ) {
-					iFormat++;
-				}
-				return matches;
-			};
-
-		for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
-			if ( literal ) {
-				if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
-					literal = false;
-				} else {
-					chars += format.charAt( iFormat );
-				}
-			} else {
-				switch ( format.charAt( iFormat ) ) {
-					case "d": case "m": case "y": case "@":
-						chars += "0123456789";
-						break;
-					case "D": case "M":
-						return null; // Accept anything
-					case "'":
-						if ( lookAhead( "'" ) ) {
-							chars += "'";
-						} else {
-							literal = true;
-						}
-						break;
-					default:
-						chars += format.charAt( iFormat );
-				}
-			}
-		}
-		return chars;
-	},
-
-	/* Get a setting value, defaulting if necessary. */
-	_get: function( inst, name ) {
-		return inst.settings[ name ] !== undefined ?
-			inst.settings[ name ] : this._defaults[ name ];
-	},
-
-	/* Parse existing date and initialise date picker. */
-	_setDateFromField: function( inst, noDefault ) {
-		if ( inst.input.val() === inst.lastVal ) {
-			return;
-		}
-
-		var dateFormat = this._get( inst, "dateFormat" ),
-			dates = inst.lastVal = inst.input ? inst.input.val() : null,
-			defaultDate = this._getDefaultDate( inst ),
-			date = defaultDate,
-			settings = this._getFormatConfig( inst );
-
-		try {
-			date = this.parseDate( dateFormat, dates, settings ) || defaultDate;
-		} catch ( event ) {
-			dates = ( noDefault ? "" : dates );
-		}
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		inst.currentDay = ( dates ? date.getDate() : 0 );
-		inst.currentMonth = ( dates ? date.getMonth() : 0 );
-		inst.currentYear = ( dates ? date.getFullYear() : 0 );
-		this._adjustInstDate( inst );
-	},
-
-	/* Retrieve the default date shown on opening. */
-	_getDefaultDate: function( inst ) {
-		return this._restrictMinMax( inst,
-			this._determineDate( inst, this._get( inst, "defaultDate" ), new Date() ) );
-	},
-
-	/* A date may be specified as an exact value or a relative one. */
-	_determineDate: function( inst, date, defaultDate ) {
-		var offsetNumeric = function( offset ) {
-				var date = new Date();
-				date.setDate( date.getDate() + offset );
-				return date;
-			},
-			offsetString = function( offset ) {
-				try {
-					return $.datepicker.parseDate( $.datepicker._get( inst, "dateFormat" ),
-						offset, $.datepicker._getFormatConfig( inst ) );
-				}
-				catch ( e ) {
-
-					// Ignore
-				}
-
-				var date = ( offset.toLowerCase().match( /^c/ ) ?
-					$.datepicker._getDate( inst ) : null ) || new Date(),
-					year = date.getFullYear(),
-					month = date.getMonth(),
-					day = date.getDate(),
-					pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
-					matches = pattern.exec( offset );
-
-				while ( matches ) {
-					switch ( matches[ 2 ] || "d" ) {
-						case "d" : case "D" :
-							day += parseInt( matches[ 1 ], 10 ); break;
-						case "w" : case "W" :
-							day += parseInt( matches[ 1 ], 10 ) * 7; break;
-						case "m" : case "M" :
-							month += parseInt( matches[ 1 ], 10 );
-							day = Math.min( day, $.datepicker._getDaysInMonth( year, month ) );
-							break;
-						case "y": case "Y" :
-							year += parseInt( matches[ 1 ], 10 );
-							day = Math.min( day, $.datepicker._getDaysInMonth( year, month ) );
-							break;
-					}
-					matches = pattern.exec( offset );
-				}
-				return new Date( year, month, day );
-			},
-			newDate = ( date == null || date === "" ? defaultDate : ( typeof date === "string" ? offsetString( date ) :
-				( typeof date === "number" ? ( isNaN( date ) ? defaultDate : offsetNumeric( date ) ) : new Date( date.getTime() ) ) ) );
-
-		newDate = ( newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate );
-		if ( newDate ) {
-			newDate.setHours( 0 );
-			newDate.setMinutes( 0 );
-			newDate.setSeconds( 0 );
-			newDate.setMilliseconds( 0 );
-		}
-		return this._daylightSavingAdjust( newDate );
-	},
-
-	/* Handle switch to/from daylight saving.
-	 * Hours may be non-zero on daylight saving cut-over:
-	 * > 12 when midnight changeover, but then cannot generate
-	 * midnight datetime, so jump to 1AM, otherwise reset.
-	 * @param  date  (Date) the date to check
-	 * @return  (Date) the corrected date
-	 */
-	_daylightSavingAdjust: function( date ) {
-		if ( !date ) {
-			return null;
-		}
-		date.setHours( date.getHours() > 12 ? date.getHours() + 2 : 0 );
-		return date;
-	},
-
-	/* Set the date(s) directly. */
-	_setDate: function( inst, date, noChange ) {
-		var clear = !date,
-			origMonth = inst.selectedMonth,
-			origYear = inst.selectedYear,
-			newDate = this._restrictMinMax( inst, this._determineDate( inst, date, new Date() ) );
-
-		inst.selectedDay = inst.currentDay = newDate.getDate();
-		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
-		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
-		if ( ( origMonth !== inst.selectedMonth || origYear !== inst.selectedYear ) && !noChange ) {
-			this._notifyChange( inst );
-		}
-		this._adjustInstDate( inst );
-		if ( inst.input ) {
-			inst.input.val( clear ? "" : this._formatDate( inst ) );
-		}
-	},
-
-	/* Retrieve the date(s) directly. */
-	_getDate: function( inst ) {
-		var startDate = ( !inst.currentYear || ( inst.input && inst.input.val() === "" ) ? null :
-			this._daylightSavingAdjust( new Date(
-			inst.currentYear, inst.currentMonth, inst.currentDay ) ) );
-			return startDate;
-	},
-
-	/* Attach the onxxx handlers.  These are declared statically so
-	 * they work with static code transformers like Caja.
-	 */
-	_attachHandlers: function( inst ) {
-		var stepMonths = this._get( inst, "stepMonths" ),
-			id = "#" + inst.id.replace( /\\\\/g, "\\" );
-		inst.dpDiv.find( "[data-handler]" ).map( function() {
-			var handler = {
-				prev: function() {
-					$.datepicker._adjustDate( id, -stepMonths, "M" );
-				},
-				next: function() {
-					$.datepicker._adjustDate( id, +stepMonths, "M" );
-				},
-				hide: function() {
-					$.datepicker._hideDatepicker();
-				},
-				today: function() {
-					$.datepicker._gotoToday( id );
-				},
-				selectDay: function() {
-					$.datepicker._selectDay( id, +this.getAttribute( "data-month" ), +this.getAttribute( "data-year" ), this );
-					return false;
-				},
-				selectMonth: function() {
-					$.datepicker._selectMonthYear( id, this, "M" );
-					return false;
-				},
-				selectYear: function() {
-					$.datepicker._selectMonthYear( id, this, "Y" );
-					return false;
-				}
-			};
-			$( this ).on( this.getAttribute( "data-event" ), handler[ this.getAttribute( "data-handler" ) ] );
-		} );
-	},
-
-	/* Generate the HTML for the current state of the date picker. */
-	_generateHTML: function( inst ) {
-		var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
-			controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
-			monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
-			selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
-			cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
-			printDate, dRow, tbody, daySettings, otherMonth, unselectable,
-			tempDate = new Date(),
-			today = this._daylightSavingAdjust(
-				new Date( tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate() ) ), // clear time
-			isRTL = this._get( inst, "isRTL" ),
-			showButtonPanel = this._get( inst, "showButtonPanel" ),
-			hideIfNoPrevNext = this._get( inst, "hideIfNoPrevNext" ),
-			navigationAsDateFormat = this._get( inst, "navigationAsDateFormat" ),
-			numMonths = this._getNumberOfMonths( inst ),
-			showCurrentAtPos = this._get( inst, "showCurrentAtPos" ),
-			stepMonths = this._get( inst, "stepMonths" ),
-			isMultiMonth = ( numMonths[ 0 ] !== 1 || numMonths[ 1 ] !== 1 ),
-			currentDate = this._daylightSavingAdjust( ( !inst.currentDay ? new Date( 9999, 9, 9 ) :
-				new Date( inst.currentYear, inst.currentMonth, inst.currentDay ) ) ),
-			minDate = this._getMinMaxDate( inst, "min" ),
-			maxDate = this._getMinMaxDate( inst, "max" ),
-			drawMonth = inst.drawMonth - showCurrentAtPos,
-			drawYear = inst.drawYear;
-
-		if ( drawMonth < 0 ) {
-			drawMonth += 12;
-			drawYear--;
-		}
-		if ( maxDate ) {
-			maxDraw = this._daylightSavingAdjust( new Date( maxDate.getFullYear(),
-				maxDate.getMonth() - ( numMonths[ 0 ] * numMonths[ 1 ] ) + 1, maxDate.getDate() ) );
-			maxDraw = ( minDate && maxDraw < minDate ? minDate : maxDraw );
-			while ( this._daylightSavingAdjust( new Date( drawYear, drawMonth, 1 ) ) > maxDraw ) {
-				drawMonth--;
-				if ( drawMonth < 0 ) {
-					drawMonth = 11;
-					drawYear--;
-				}
-			}
-		}
-		inst.drawMonth = drawMonth;
-		inst.drawYear = drawYear;
-
-		prevText = this._get( inst, "prevText" );
-		prevText = ( !navigationAsDateFormat ? prevText : this.formatDate( prevText,
-			this._daylightSavingAdjust( new Date( drawYear, drawMonth - stepMonths, 1 ) ),
-			this._getFormatConfig( inst ) ) );
-
-		prev = ( this._canAdjustMonth( inst, -1, drawYear, drawMonth ) ?
-			"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
-			" title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w" ) + "'>" + prevText + "</span></a>" :
-			( hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w" ) + "'>" + prevText + "</span></a>" ) );
-
-		nextText = this._get( inst, "nextText" );
-		nextText = ( !navigationAsDateFormat ? nextText : this.formatDate( nextText,
-			this._daylightSavingAdjust( new Date( drawYear, drawMonth + stepMonths, 1 ) ),
-			this._getFormatConfig( inst ) ) );
-
-		next = ( this._canAdjustMonth( inst, +1, drawYear, drawMonth ) ?
-			"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
-			" title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e" ) + "'>" + nextText + "</span></a>" :
-			( hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e" ) + "'>" + nextText + "</span></a>" ) );
-
-		currentText = this._get( inst, "currentText" );
-		gotoDate = ( this._get( inst, "gotoCurrent" ) && inst.currentDay ? currentDate : today );
-		currentText = ( !navigationAsDateFormat ? currentText :
-			this.formatDate( currentText, gotoDate, this._getFormatConfig( inst ) ) );
-
-		controls = ( !inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
-			this._get( inst, "closeText" ) + "</button>" : "" );
-
-		buttonPanel = ( showButtonPanel ) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + ( isRTL ? controls : "" ) +
-			( this._isInRange( inst, gotoDate ) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
-			">" + currentText + "</button>" : "" ) + ( isRTL ? "" : controls ) + "</div>" : "";
-
-		firstDay = parseInt( this._get( inst, "firstDay" ), 10 );
-		firstDay = ( isNaN( firstDay ) ? 0 : firstDay );
-
-		showWeek = this._get( inst, "showWeek" );
-		dayNames = this._get( inst, "dayNames" );
-		dayNamesMin = this._get( inst, "dayNamesMin" );
-		monthNames = this._get( inst, "monthNames" );
-		monthNamesShort = this._get( inst, "monthNamesShort" );
-		beforeShowDay = this._get( inst, "beforeShowDay" );
-		showOtherMonths = this._get( inst, "showOtherMonths" );
-		selectOtherMonths = this._get( inst, "selectOtherMonths" );
-		defaultDate = this._getDefaultDate( inst );
-		html = "";
-
-		for ( row = 0; row < numMonths[ 0 ]; row++ ) {
-			group = "";
-			this.maxRows = 4;
-			for ( col = 0; col < numMonths[ 1 ]; col++ ) {
-				selectedDate = this._daylightSavingAdjust( new Date( drawYear, drawMonth, inst.selectedDay ) );
-				cornerClass = " ui-corner-all";
-				calender = "";
-				if ( isMultiMonth ) {
-					calender += "<div class='ui-datepicker-group";
-					if ( numMonths[ 1 ] > 1 ) {
-						switch ( col ) {
-							case 0: calender += " ui-datepicker-group-first";
-								cornerClass = " ui-corner-" + ( isRTL ? "right" : "left" ); break;
-							case numMonths[ 1 ] - 1: calender += " ui-datepicker-group-last";
-								cornerClass = " ui-corner-" + ( isRTL ? "left" : "right" ); break;
-							default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
-						}
-					}
-					calender += "'>";
-				}
-				calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
-					( /all|left/.test( cornerClass ) && row === 0 ? ( isRTL ? next : prev ) : "" ) +
-					( /all|right/.test( cornerClass ) && row === 0 ? ( isRTL ? prev : next ) : "" ) +
-					this._generateMonthYearHeader( inst, drawMonth, drawYear, minDate, maxDate,
-					row > 0 || col > 0, monthNames, monthNamesShort ) + // draw month headers
-					"</div><table class='ui-datepicker-calendar'><thead>" +
-					"<tr>";
-				thead = ( showWeek ? "<th class='ui-datepicker-week-col'>" + this._get( inst, "weekHeader" ) + "</th>" : "" );
-				for ( dow = 0; dow < 7; dow++ ) { // days of the week
-					day = ( dow + firstDay ) % 7;
-					thead += "<th scope='col'" + ( ( dow + firstDay + 6 ) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "" ) + ">" +
-						"<span title='" + dayNames[ day ] + "'>" + dayNamesMin[ day ] + "</span></th>";
-				}
-				calender += thead + "</tr></thead><tbody>";
-				daysInMonth = this._getDaysInMonth( drawYear, drawMonth );
-				if ( drawYear === inst.selectedYear && drawMonth === inst.selectedMonth ) {
-					inst.selectedDay = Math.min( inst.selectedDay, daysInMonth );
-				}
-				leadDays = ( this._getFirstDayOfMonth( drawYear, drawMonth ) - firstDay + 7 ) % 7;
-				curRows = Math.ceil( ( leadDays + daysInMonth ) / 7 ); // calculate the number of rows to generate
-				numRows = ( isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows ); //If multiple months, use the higher number of rows (see #7043)
-				this.maxRows = numRows;
-				printDate = this._daylightSavingAdjust( new Date( drawYear, drawMonth, 1 - leadDays ) );
-				for ( dRow = 0; dRow < numRows; dRow++ ) { // create date picker rows
-					calender += "<tr>";
-					tbody = ( !showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
-						this._get( inst, "calculateWeek" )( printDate ) + "</td>" );
-					for ( dow = 0; dow < 7; dow++ ) { // create date picker days
-						daySettings = ( beforeShowDay ?
-							beforeShowDay.apply( ( inst.input ? inst.input[ 0 ] : null ), [ printDate ] ) : [ true, "" ] );
-						otherMonth = ( printDate.getMonth() !== drawMonth );
-						unselectable = ( otherMonth && !selectOtherMonths ) || !daySettings[ 0 ] ||
-							( minDate && printDate < minDate ) || ( maxDate && printDate > maxDate );
-						tbody += "<td class='" +
-							( ( dow + firstDay + 6 ) % 7 >= 5 ? " ui-datepicker-week-end" : "" ) + // highlight weekends
-							( otherMonth ? " ui-datepicker-other-month" : "" ) + // highlight days from other months
-							( ( printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent ) || // user pressed key
-							( defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime() ) ?
-
-							// or defaultDate is current printedDate and defaultDate is selectedDate
-							" " + this._dayOverClass : "" ) + // highlight selected day
-							( unselectable ? " " + this._unselectableClass + " ui-state-disabled" : "" ) +  // highlight unselectable days
-							( otherMonth && !showOtherMonths ? "" : " " + daySettings[ 1 ] + // highlight custom dates
-							( printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "" ) + // highlight selected day
-							( printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "" ) ) + "'" + // highlight today (if different)
-							( ( !otherMonth || showOtherMonths ) && daySettings[ 2 ] ? " title='" + daySettings[ 2 ].replace( /'/g, "&#39;" ) + "'" : "" ) + // cell title
-							( unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'" ) + ">" + // actions
-							( otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
-							( unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
-							( printDate.getTime() === today.getTime() ? " ui-state-highlight" : "" ) +
-							( printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "" ) + // highlight selected day
-							( otherMonth ? " ui-priority-secondary" : "" ) + // distinguish dates from other months
-							"' href='#'>" + printDate.getDate() + "</a>" ) ) + "</td>"; // display selectable date
-						printDate.setDate( printDate.getDate() + 1 );
-						printDate = this._daylightSavingAdjust( printDate );
-					}
-					calender += tbody + "</tr>";
-				}
-				drawMonth++;
-				if ( drawMonth > 11 ) {
-					drawMonth = 0;
-					drawYear++;
-				}
-				calender += "</tbody></table>" + ( isMultiMonth ? "</div>" +
-							( ( numMonths[ 0 ] > 0 && col === numMonths[ 1 ] - 1 ) ? "<div class='ui-datepicker-row-break'></div>" : "" ) : "" );
-				group += calender;
-			}
-			html += group;
-		}
-		html += buttonPanel;
-		inst._keyEvent = false;
-		return html;
-	},
-
-	/* Generate the month and year header. */
-	_generateMonthYearHeader: function( inst, drawMonth, drawYear, minDate, maxDate,
-			secondary, monthNames, monthNamesShort ) {
-
-		var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
-			changeMonth = this._get( inst, "changeMonth" ),
-			changeYear = this._get( inst, "changeYear" ),
-			showMonthAfterYear = this._get( inst, "showMonthAfterYear" ),
-			html = "<div class='ui-datepicker-title'>",
-			monthHtml = "";
-
-		// Month selection
-		if ( secondary || !changeMonth ) {
-			monthHtml += "<span class='ui-datepicker-month'>" + monthNames[ drawMonth ] + "</span>";
-		} else {
-			inMinYear = ( minDate && minDate.getFullYear() === drawYear );
-			inMaxYear = ( maxDate && maxDate.getFullYear() === drawYear );
-			monthHtml += "<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";
-			for ( month = 0; month < 12; month++ ) {
-				if ( ( !inMinYear || month >= minDate.getMonth() ) && ( !inMaxYear || month <= maxDate.getMonth() ) ) {
-					monthHtml += "<option value='" + month + "'" +
-						( month === drawMonth ? " selected='selected'" : "" ) +
-						">" + monthNamesShort[ month ] + "</option>";
-				}
-			}
-			monthHtml += "</select>";
-		}
-
-		if ( !showMonthAfterYear ) {
-			html += monthHtml + ( secondary || !( changeMonth && changeYear ) ? "&#xa0;" : "" );
-		}
-
-		// Year selection
-		if ( !inst.yearshtml ) {
-			inst.yearshtml = "";
-			if ( secondary || !changeYear ) {
-				html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
-			} else {
-
-				// determine range of years to display
-				years = this._get( inst, "yearRange" ).split( ":" );
-				thisYear = new Date().getFullYear();
-				determineYear = function( value ) {
-					var year = ( value.match( /c[+\-].*/ ) ? drawYear + parseInt( value.substring( 1 ), 10 ) :
-						( value.match( /[+\-].*/ ) ? thisYear + parseInt( value, 10 ) :
-						parseInt( value, 10 ) ) );
-					return ( isNaN( year ) ? thisYear : year );
-				};
-				year = determineYear( years[ 0 ] );
-				endYear = Math.max( year, determineYear( years[ 1 ] || "" ) );
-				year = ( minDate ? Math.max( year, minDate.getFullYear() ) : year );
-				endYear = ( maxDate ? Math.min( endYear, maxDate.getFullYear() ) : endYear );
-				inst.yearshtml += "<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";
-				for ( ; year <= endYear; year++ ) {
-					inst.yearshtml += "<option value='" + year + "'" +
-						( year === drawYear ? " selected='selected'" : "" ) +
-						">" + year + "</option>";
-				}
-				inst.yearshtml += "</select>";
-
-				html += inst.yearshtml;
-				inst.yearshtml = null;
-			}
-		}
-
-		html += this._get( inst, "yearSuffix" );
-		if ( showMonthAfterYear ) {
-			html += ( secondary || !( changeMonth && changeYear ) ? "&#xa0;" : "" ) + monthHtml;
-		}
-		html += "</div>"; // Close datepicker_header
-		return html;
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustInstDate: function( inst, offset, period ) {
-		var year = inst.selectedYear + ( period === "Y" ? offset : 0 ),
-			month = inst.selectedMonth + ( period === "M" ? offset : 0 ),
-			day = Math.min( inst.selectedDay, this._getDaysInMonth( year, month ) ) + ( period === "D" ? offset : 0 ),
-			date = this._restrictMinMax( inst, this._daylightSavingAdjust( new Date( year, month, day ) ) );
-
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		if ( period === "M" || period === "Y" ) {
-			this._notifyChange( inst );
-		}
-	},
-
-	/* Ensure a date is within any min/max bounds. */
-	_restrictMinMax: function( inst, date ) {
-		var minDate = this._getMinMaxDate( inst, "min" ),
-			maxDate = this._getMinMaxDate( inst, "max" ),
-			newDate = ( minDate && date < minDate ? minDate : date );
-		return ( maxDate && newDate > maxDate ? maxDate : newDate );
-	},
-
-	/* Notify change of month/year. */
-	_notifyChange: function( inst ) {
-		var onChange = this._get( inst, "onChangeMonthYear" );
-		if ( onChange ) {
-			onChange.apply( ( inst.input ? inst.input[ 0 ] : null ),
-				[ inst.selectedYear, inst.selectedMonth + 1, inst ] );
-		}
-	},
-
-	/* Determine the number of months to show. */
-	_getNumberOfMonths: function( inst ) {
-		var numMonths = this._get( inst, "numberOfMonths" );
-		return ( numMonths == null ? [ 1, 1 ] : ( typeof numMonths === "number" ? [ 1, numMonths ] : numMonths ) );
-	},
-
-	/* Determine the current maximum date - ensure no time components are set. */
-	_getMinMaxDate: function( inst, minMax ) {
-		return this._determineDate( inst, this._get( inst, minMax + "Date" ), null );
-	},
-
-	/* Find the number of days in a given month. */
-	_getDaysInMonth: function( year, month ) {
-		return 32 - this._daylightSavingAdjust( new Date( year, month, 32 ) ).getDate();
-	},
-
-	/* Find the day of the week of the first of a month. */
-	_getFirstDayOfMonth: function( year, month ) {
-		return new Date( year, month, 1 ).getDay();
-	},
-
-	/* Determines if we should allow a "next/prev" month display change. */
-	_canAdjustMonth: function( inst, offset, curYear, curMonth ) {
-		var numMonths = this._getNumberOfMonths( inst ),
-			date = this._daylightSavingAdjust( new Date( curYear,
-			curMonth + ( offset < 0 ? offset : numMonths[ 0 ] * numMonths[ 1 ] ), 1 ) );
-
-		if ( offset < 0 ) {
-			date.setDate( this._getDaysInMonth( date.getFullYear(), date.getMonth() ) );
-		}
-		return this._isInRange( inst, date );
-	},
-
-	/* Is the given date in the accepted range? */
-	_isInRange: function( inst, date ) {
-		var yearSplit, currentYear,
-			minDate = this._getMinMaxDate( inst, "min" ),
-			maxDate = this._getMinMaxDate( inst, "max" ),
-			minYear = null,
-			maxYear = null,
-			years = this._get( inst, "yearRange" );
-			if ( years ) {
-				yearSplit = years.split( ":" );
-				currentYear = new Date().getFullYear();
-				minYear = parseInt( yearSplit[ 0 ], 10 );
-				maxYear = parseInt( yearSplit[ 1 ], 10 );
-				if ( yearSplit[ 0 ].match( /[+\-].*/ ) ) {
-					minYear += currentYear;
-				}
-				if ( yearSplit[ 1 ].match( /[+\-].*/ ) ) {
-					maxYear += currentYear;
-				}
-			}
-
-		return ( ( !minDate || date.getTime() >= minDate.getTime() ) &&
-			( !maxDate || date.getTime() <= maxDate.getTime() ) &&
-			( !minYear || date.getFullYear() >= minYear ) &&
-			( !maxYear || date.getFullYear() <= maxYear ) );
-	},
-
-	/* Provide the configuration settings for formatting/parsing. */
-	_getFormatConfig: function( inst ) {
-		var shortYearCutoff = this._get( inst, "shortYearCutoff" );
-		shortYearCutoff = ( typeof shortYearCutoff !== "string" ? shortYearCutoff :
-			new Date().getFullYear() % 100 + parseInt( shortYearCutoff, 10 ) );
-		return { shortYearCutoff: shortYearCutoff,
-			dayNamesShort: this._get( inst, "dayNamesShort" ), dayNames: this._get( inst, "dayNames" ),
-			monthNamesShort: this._get( inst, "monthNamesShort" ), monthNames: this._get( inst, "monthNames" ) };
-	},
-
-	/* Format the given date for display. */
-	_formatDate: function( inst, day, month, year ) {
-		if ( !day ) {
-			inst.currentDay = inst.selectedDay;
-			inst.currentMonth = inst.selectedMonth;
-			inst.currentYear = inst.selectedYear;
-		}
-		var date = ( day ? ( typeof day === "object" ? day :
-			this._daylightSavingAdjust( new Date( year, month, day ) ) ) :
-			this._daylightSavingAdjust( new Date( inst.currentYear, inst.currentMonth, inst.currentDay ) ) );
-		return this.formatDate( this._get( inst, "dateFormat" ), date, this._getFormatConfig( inst ) );
-	}
-} );
-
-/*
- * Bind hover events for datepicker elements.
- * Done via delegate so the binding only occurs once in the lifetime of the parent div.
- * Global datepicker_instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
- */
-function datepicker_bindHover( dpDiv ) {
-	var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
-	return dpDiv.on( "mouseout", selector, function() {
-			$( this ).removeClass( "ui-state-hover" );
-			if ( this.className.indexOf( "ui-datepicker-prev" ) !== -1 ) {
-				$( this ).removeClass( "ui-datepicker-prev-hover" );
-			}
-			if ( this.className.indexOf( "ui-datepicker-next" ) !== -1 ) {
-				$( this ).removeClass( "ui-datepicker-next-hover" );
-			}
-		} )
-		.on( "mouseover", selector, datepicker_handleMouseover );
-}
-
-function datepicker_handleMouseover() {
-	if ( !$.datepicker._isDisabledDatepicker( datepicker_instActive.inline ? datepicker_instActive.dpDiv.parent()[ 0 ] : datepicker_instActive.input[ 0 ] ) ) {
-		$( this ).parents( ".ui-datepicker-calendar" ).find( "a" ).removeClass( "ui-state-hover" );
-		$( this ).addClass( "ui-state-hover" );
-		if ( this.className.indexOf( "ui-datepicker-prev" ) !== -1 ) {
-			$( this ).addClass( "ui-datepicker-prev-hover" );
-		}
-		if ( this.className.indexOf( "ui-datepicker-next" ) !== -1 ) {
-			$( this ).addClass( "ui-datepicker-next-hover" );
-		}
-	}
-}
-
-/* jQuery extend now ignores nulls! */
-function datepicker_extendRemove( target, props ) {
-	$.extend( target, props );
-	for ( var name in props ) {
-		if ( props[ name ] == null ) {
-			target[ name ] = props[ name ];
-		}
-	}
-	return target;
-}
-
-/* Invoke the datepicker functionality.
-   @param  options  string - a command, optionally followed by additional parameters or
-					Object - settings for attaching new datepicker functionality
-   @return  jQuery object */
-$.fn.datepicker = function( options ) {
-
-	/* Verify an empty collection wasn't passed - Fixes #6976 */
-	if ( !this.length ) {
-		return this;
-	}
-
-	/* Initialise the date picker. */
-	if ( !$.datepicker.initialized ) {
-		$( document ).on( "mousedown", $.datepicker._checkExternalClick );
-		$.datepicker.initialized = true;
-	}
-
-	/* Append datepicker main container to body if not exist. */
-	if ( $( "#" + $.datepicker._mainDivId ).length === 0 ) {
-		$( "body" ).append( $.datepicker.dpDiv );
-	}
-
-	var otherArgs = Array.prototype.slice.call( arguments, 1 );
-	if ( typeof options === "string" && ( options === "isDisabled" || options === "getDate" || options === "widget" ) ) {
-		return $.datepicker[ "_" + options + "Datepicker" ].
-			apply( $.datepicker, [ this[ 0 ] ].concat( otherArgs ) );
-	}
-	if ( options === "option" && arguments.length === 2 && typeof arguments[ 1 ] === "string" ) {
-		return $.datepicker[ "_" + options + "Datepicker" ].
-			apply( $.datepicker, [ this[ 0 ] ].concat( otherArgs ) );
-	}
-	return this.each( function() {
-		typeof options === "string" ?
-			$.datepicker[ "_" + options + "Datepicker" ].
-				apply( $.datepicker, [ this ].concat( otherArgs ) ) :
-			$.datepicker._attachDatepicker( this, options );
-	} );
-};
-
-$.datepicker = new Datepicker(); // singleton instance
-$.datepicker.initialized = false;
-$.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.12.1";
-
-var widgetsDatepicker = $.datepicker;
-
-
-
-
-// This file is deprecated
-var ie = $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
-
-/*!
- * jQuery UI Mouse 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Mouse
-//>>group: Widgets
-//>>description: Abstracts mouse-based interactions to assist in creating certain widgets.
-//>>docs: http://api.jqueryui.com/mouse/
-
-
-
-var mouseHandled = false;
-$( document ).on( "mouseup", function() {
-	mouseHandled = false;
-} );
-
-var widgetsMouse = $.widget( "ui.mouse", {
-	version: "1.12.1",
-	options: {
-		cancel: "input, textarea, button, select, option",
-		distance: 1,
-		delay: 0
-	},
-	_mouseInit: function() {
-		var that = this;
-
-		this.element
-			.on( "mousedown." + this.widgetName, function( event ) {
-				return that._mouseDown( event );
-			} )
-			.on( "click." + this.widgetName, function( event ) {
-				if ( true === $.data( event.target, that.widgetName + ".preventClickEvent" ) ) {
-					$.removeData( event.target, that.widgetName + ".preventClickEvent" );
-					event.stopImmediatePropagation();
-					return false;
-				}
-			} );
-
-		this.started = false;
-	},
-
-	// TODO: make sure destroying one instance of mouse doesn't mess with
-	// other instances of mouse
-	_mouseDestroy: function() {
-		this.element.off( "." + this.widgetName );
-		if ( this._mouseMoveDelegate ) {
-			this.document
-				.off( "mousemove." + this.widgetName, this._mouseMoveDelegate )
-				.off( "mouseup." + this.widgetName, this._mouseUpDelegate );
-		}
-	},
-
-	_mouseDown: function( event ) {
-
-		// don't let more than one widget handle mouseStart
-		if ( mouseHandled ) {
-			return;
-		}
-
-		this._mouseMoved = false;
-
-		// We may have missed mouseup (out of window)
-		( this._mouseStarted && this._mouseUp( event ) );
-
-		this._mouseDownEvent = event;
-
-		var that = this,
-			btnIsLeft = ( event.which === 1 ),
-
-			// event.target.nodeName works around a bug in IE 8 with
-			// disabled inputs (#7620)
-			elIsCancel = ( typeof this.options.cancel === "string" && event.target.nodeName ?
-				$( event.target ).closest( this.options.cancel ).length : false );
-		if ( !btnIsLeft || elIsCancel || !this._mouseCapture( event ) ) {
-			return true;
-		}
-
-		this.mouseDelayMet = !this.options.delay;
-		if ( !this.mouseDelayMet ) {
-			this._mouseDelayTimer = setTimeout( function() {
-				that.mouseDelayMet = true;
-			}, this.options.delay );
-		}
-
-		if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) {
-			this._mouseStarted = ( this._mouseStart( event ) !== false );
-			if ( !this._mouseStarted ) {
-				event.preventDefault();
-				return true;
-			}
-		}
-
-		// Click event may never have fired (Gecko & Opera)
-		if ( true === $.data( event.target, this.widgetName + ".preventClickEvent" ) ) {
-			$.removeData( event.target, this.widgetName + ".preventClickEvent" );
-		}
-
-		// These delegates are required to keep context
-		this._mouseMoveDelegate = function( event ) {
-			return that._mouseMove( event );
-		};
-		this._mouseUpDelegate = function( event ) {
-			return that._mouseUp( event );
-		};
-
-		this.document
-			.on( "mousemove." + this.widgetName, this._mouseMoveDelegate )
-			.on( "mouseup." + this.widgetName, this._mouseUpDelegate );
-
-		event.preventDefault();
-
-		mouseHandled = true;
-		return true;
-	},
-
-	_mouseMove: function( event ) {
-
-		// Only check for mouseups outside the document if you've moved inside the document
-		// at least once. This prevents the firing of mouseup in the case of IE<9, which will
-		// fire a mousemove event if content is placed under the cursor. See #7778
-		// Support: IE <9
-		if ( this._mouseMoved ) {
-
-			// IE mouseup check - mouseup happened when mouse was out of window
-			if ( $.ui.ie && ( !document.documentMode || document.documentMode < 9 ) &&
-					!event.button ) {
-				return this._mouseUp( event );
-
-			// Iframe mouseup check - mouseup occurred in another document
-			} else if ( !event.which ) {
-
-				// Support: Safari <=8 - 9
-				// Safari sets which to 0 if you press any of the following keys
-				// during a drag (#14461)
-				if ( event.originalEvent.altKey || event.originalEvent.ctrlKey ||
-						event.originalEvent.metaKey || event.originalEvent.shiftKey ) {
-					this.ignoreMissingWhich = true;
-				} else if ( !this.ignoreMissingWhich ) {
-					return this._mouseUp( event );
-				}
-			}
-		}
-
-		if ( event.which || event.button ) {
-			this._mouseMoved = true;
-		}
-
-		if ( this._mouseStarted ) {
-			this._mouseDrag( event );
-			return event.preventDefault();
-		}
-
-		if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) {
-			this._mouseStarted =
-				( this._mouseStart( this._mouseDownEvent, event ) !== false );
-			( this._mouseStarted ? this._mouseDrag( event ) : this._mouseUp( event ) );
-		}
-
-		return !this._mouseStarted;
-	},
-
-	_mouseUp: function( event ) {
-		this.document
-			.off( "mousemove." + this.widgetName, this._mouseMoveDelegate )
-			.off( "mouseup." + this.widgetName, this._mouseUpDelegate );
-
-		if ( this._mouseStarted ) {
-			this._mouseStarted = false;
-
-			if ( event.target === this._mouseDownEvent.target ) {
-				$.data( event.target, this.widgetName + ".preventClickEvent", true );
-			}
-
-			this._mouseStop( event );
-		}
-
-		if ( this._mouseDelayTimer ) {
-			clearTimeout( this._mouseDelayTimer );
-			delete this._mouseDelayTimer;
-		}
-
-		this.ignoreMissingWhich = false;
-		mouseHandled = false;
-		event.preventDefault();
-	},
-
-	_mouseDistanceMet: function( event ) {
-		return ( Math.max(
-				Math.abs( this._mouseDownEvent.pageX - event.pageX ),
-				Math.abs( this._mouseDownEvent.pageY - event.pageY )
-			) >= this.options.distance
-		);
-	},
-
-	_mouseDelayMet: function( /* event */ ) {
-		return this.mouseDelayMet;
-	},
-
-	// These are placeholder methods, to be overriden by extending plugin
-	_mouseStart: function( /* event */ ) {},
-	_mouseDrag: function( /* event */ ) {},
-	_mouseStop: function( /* event */ ) {},
-	_mouseCapture: function( /* event */ ) { return true; }
-} );
-
-
-
-
-// $.ui.plugin is deprecated. Use $.widget() extensions instead.
-var plugin = $.ui.plugin = {
-	add: function( module, option, set ) {
-		var i,
-			proto = $.ui[ module ].prototype;
-		for ( i in set ) {
-			proto.plugins[ i ] = proto.plugins[ i ] || [];
-			proto.plugins[ i ].push( [ option, set[ i ] ] );
-		}
-	},
-	call: function( instance, name, args, allowDisconnected ) {
-		var i,
-			set = instance.plugins[ name ];
-
-		if ( !set ) {
-			return;
-		}
-
-		if ( !allowDisconnected && ( !instance.element[ 0 ].parentNode ||
-				instance.element[ 0 ].parentNode.nodeType === 11 ) ) {
-			return;
-		}
-
-		for ( i = 0; i < set.length; i++ ) {
-			if ( instance.options[ set[ i ][ 0 ] ] ) {
-				set[ i ][ 1 ].apply( instance.element, args );
-			}
-		}
-	}
-};
-
-
-
-var safeBlur = $.ui.safeBlur = function( element ) {
-
-	// Support: IE9 - 10 only
-	// If the <body> is blurred, IE will switch windows, see #9420
-	if ( element && element.nodeName.toLowerCase() !== "body" ) {
-		$( element ).trigger( "blur" );
-	}
-};
-
-
-/*!
- * jQuery UI Draggable 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Draggable
-//>>group: Interactions
-//>>description: Enables dragging functionality for any element.
-//>>docs: http://api.jqueryui.com/draggable/
-//>>demos: http://jqueryui.com/draggable/
-//>>css.structure: ../../themes/base/draggable.css
-
-
-
-$.widget( "ui.draggable", $.ui.mouse, {
-	version: "1.12.1",
-	widgetEventPrefix: "drag",
-	options: {
-		addClasses: true,
-		appendTo: "parent",
-		axis: false,
-		connectToSortable: false,
-		containment: false,
-		cursor: "auto",
-		cursorAt: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		iframeFix: false,
-		opacity: false,
-		refreshPositions: false,
-		revert: false,
-		revertDuration: 500,
-		scope: "default",
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		snap: false,
-		snapMode: "both",
-		snapTolerance: 20,
-		stack: false,
-		zIndex: false,
-
-		// Callbacks
-		drag: null,
-		start: null,
-		stop: null
-	},
-	_create: function() {
-
-		if ( this.options.helper === "original" ) {
-			this._setPositionRelative();
-		}
-		if ( this.options.addClasses ) {
-			this._addClass( "ui-draggable" );
-		}
-		this._setHandleClassName();
-
-		this._mouseInit();
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-		if ( key === "handle" ) {
-			this._removeHandleClassName();
-			this._setHandleClassName();
-		}
-	},
-
-	_destroy: function() {
-		if ( ( this.helper || this.element ).is( ".ui-draggable-dragging" ) ) {
-			this.destroyOnClear = true;
-			return;
-		}
-		this._removeHandleClassName();
-		this._mouseDestroy();
-	},
-
-	_mouseCapture: function( event ) {
-		var o = this.options;
-
-		// Among others, prevent a drag on a resizable-handle
-		if ( this.helper || o.disabled ||
-				$( event.target ).closest( ".ui-resizable-handle" ).length > 0 ) {
-			return false;
-		}
-
-		//Quit if we're not on a valid handle
-		this.handle = this._getHandle( event );
-		if ( !this.handle ) {
-			return false;
-		}
-
-		this._blurActiveElement( event );
-
-		this._blockFrames( o.iframeFix === true ? "iframe" : o.iframeFix );
-
-		return true;
-
-	},
-
-	_blockFrames: function( selector ) {
-		this.iframeBlocks = this.document.find( selector ).map( function() {
-			var iframe = $( this );
-
-			return $( "<div>" )
-				.css( "position", "absolute" )
-				.appendTo( iframe.parent() )
-				.outerWidth( iframe.outerWidth() )
-				.outerHeight( iframe.outerHeight() )
-				.offset( iframe.offset() )[ 0 ];
-		} );
-	},
-
-	_unblockFrames: function() {
-		if ( this.iframeBlocks ) {
-			this.iframeBlocks.remove();
-			delete this.iframeBlocks;
-		}
-	},
-
-	_blurActiveElement: function( event ) {
-		var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
-			target = $( event.target );
-
-		// Don't blur if the event occurred on an element that is within
-		// the currently focused element
-		// See #10527, #12472
-		if ( target.closest( activeElement ).length ) {
-			return;
-		}
-
-		// Blur any element that currently has focus, see #4261
-		$.ui.safeBlur( activeElement );
-	},
-
-	_mouseStart: function( event ) {
-
-		var o = this.options;
-
-		//Create and append the visible helper
-		this.helper = this._createHelper( event );
-
-		this._addClass( this.helper, "ui-draggable-dragging" );
-
-		//Cache the helper size
-		this._cacheHelperProportions();
-
-		//If ddmanager is used for droppables, set the global draggable
-		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.current = this;
-		}
-
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-
-		//Cache the margins of the original element
-		this._cacheMargins();
-
-		//Store the helper's css position
-		this.cssPosition = this.helper.css( "position" );
-		this.scrollParent = this.helper.scrollParent( true );
-		this.offsetParent = this.helper.offsetParent();
-		this.hasFixedAncestor = this.helper.parents().filter( function() {
-				return $( this ).css( "position" ) === "fixed";
-			} ).length > 0;
-
-		//The element's absolute position on the page minus margins
-		this.positionAbs = this.element.offset();
-		this._refreshOffsets( event );
-
-		//Generate the original position
-		this.originalPosition = this.position = this._generatePosition( event, false );
-		this.originalPageX = event.pageX;
-		this.originalPageY = event.pageY;
-
-		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
-		( o.cursorAt && this._adjustOffsetFromHelper( o.cursorAt ) );
-
-		//Set a containment if given in the options
-		this._setContainment();
-
-		//Trigger event + callbacks
-		if ( this._trigger( "start", event ) === false ) {
-			this._clear();
-			return false;
-		}
-
-		//Recache the helper size
-		this._cacheHelperProportions();
-
-		//Prepare the droppable offsets
-		if ( $.ui.ddmanager && !o.dropBehaviour ) {
-			$.ui.ddmanager.prepareOffsets( this, event );
-		}
-
-		// Execute the drag once - this causes the helper not to be visible before getting its
-		// correct position
-		this._mouseDrag( event, true );
-
-		// If the ddmanager is used for droppables, inform the manager that dragging has started
-		// (see #5003)
-		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.dragStart( this, event );
-		}
-
-		return true;
-	},
-
-	_refreshOffsets: function( event ) {
-		this.offset = {
-			top: this.positionAbs.top - this.margins.top,
-			left: this.positionAbs.left - this.margins.left,
-			scroll: false,
-			parent: this._getParentOffset(),
-			relative: this._getRelativeOffset()
-		};
-
-		this.offset.click = {
-			left: event.pageX - this.offset.left,
-			top: event.pageY - this.offset.top
-		};
-	},
-
-	_mouseDrag: function( event, noPropagation ) {
-
-		// reset any necessary cached properties (see #5009)
-		if ( this.hasFixedAncestor ) {
-			this.offset.parent = this._getParentOffset();
-		}
-
-		//Compute the helpers position
-		this.position = this._generatePosition( event, true );
-		this.positionAbs = this._convertPositionTo( "absolute" );
-
-		//Call plugins and callbacks and use the resulting position if something is returned
-		if ( !noPropagation ) {
-			var ui = this._uiHash();
-			if ( this._trigger( "drag", event, ui ) === false ) {
-				this._mouseUp( new $.Event( "mouseup", event ) );
-				return false;
-			}
-			this.position = ui.position;
-		}
-
-		this.helper[ 0 ].style.left = this.position.left + "px";
-		this.helper[ 0 ].style.top = this.position.top + "px";
-
-		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.drag( this, event );
-		}
-
-		return false;
-	},
-
-	_mouseStop: function( event ) {
-
-		//If we are using droppables, inform the manager about the drop
-		var that = this,
-			dropped = false;
-		if ( $.ui.ddmanager && !this.options.dropBehaviour ) {
-			dropped = $.ui.ddmanager.drop( this, event );
-		}
-
-		//if a drop comes from outside (a sortable)
-		if ( this.dropped ) {
-			dropped = this.dropped;
-			this.dropped = false;
-		}
-
-		if ( ( this.options.revert === "invalid" && !dropped ) ||
-				( this.options.revert === "valid" && dropped ) ||
-				this.options.revert === true || ( $.isFunction( this.options.revert ) &&
-				this.options.revert.call( this.element, dropped ) )
-		) {
-			$( this.helper ).animate(
-				this.originalPosition,
-				parseInt( this.options.revertDuration, 10 ),
-				function() {
-					if ( that._trigger( "stop", event ) !== false ) {
-						that._clear();
-					}
-				}
-			);
-		} else {
-			if ( this._trigger( "stop", event ) !== false ) {
-				this._clear();
-			}
-		}
-
-		return false;
-	},
-
-	_mouseUp: function( event ) {
-		this._unblockFrames();
-
-		// If the ddmanager is used for droppables, inform the manager that dragging has stopped
-		// (see #5003)
-		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.dragStop( this, event );
-		}
-
-		// Only need to focus if the event occurred on the draggable itself, see #10527
-		if ( this.handleElement.is( event.target ) ) {
-
-			// The interaction is over; whether or not the click resulted in a drag,
-			// focus the element
-			this.element.trigger( "focus" );
-		}
-
-		return $.ui.mouse.prototype._mouseUp.call( this, event );
-	},
-
-	cancel: function() {
-
-		if ( this.helper.is( ".ui-draggable-dragging" ) ) {
-			this._mouseUp( new $.Event( "mouseup", { target: this.element[ 0 ] } ) );
-		} else {
-			this._clear();
-		}
-
-		return this;
-
-	},
-
-	_getHandle: function( event ) {
-		return this.options.handle ?
-			!!$( event.target ).closest( this.element.find( this.options.handle ) ).length :
-			true;
-	},
-
-	_setHandleClassName: function() {
-		this.handleElement = this.options.handle ?
-			this.element.find( this.options.handle ) : this.element;
-		this._addClass( this.handleElement, "ui-draggable-handle" );
-	},
-
-	_removeHandleClassName: function() {
-		this._removeClass( this.handleElement, "ui-draggable-handle" );
-	},
-
-	_createHelper: function( event ) {
-
-		var o = this.options,
-			helperIsFunction = $.isFunction( o.helper ),
-			helper = helperIsFunction ?
-				$( o.helper.apply( this.element[ 0 ], [ event ] ) ) :
-				( o.helper === "clone" ?
-					this.element.clone().removeAttr( "id" ) :
-					this.element );
-
-		if ( !helper.parents( "body" ).length ) {
-			helper.appendTo( ( o.appendTo === "parent" ?
-				this.element[ 0 ].parentNode :
-				o.appendTo ) );
-		}
-
-		// Http://bugs.jqueryui.com/ticket/9446
-		// a helper function can return the original element
-		// which wouldn't have been set to relative in _create
-		if ( helperIsFunction && helper[ 0 ] === this.element[ 0 ] ) {
-			this._setPositionRelative();
-		}
-
-		if ( helper[ 0 ] !== this.element[ 0 ] &&
-				!( /(fixed|absolute)/ ).test( helper.css( "position" ) ) ) {
-			helper.css( "position", "absolute" );
-		}
-
-		return helper;
-
-	},
-
-	_setPositionRelative: function() {
-		if ( !( /^(?:r|a|f)/ ).test( this.element.css( "position" ) ) ) {
-			this.element[ 0 ].style.position = "relative";
-		}
-	},
-
-	_adjustOffsetFromHelper: function( obj ) {
-		if ( typeof obj === "string" ) {
-			obj = obj.split( " " );
-		}
-		if ( $.isArray( obj ) ) {
-			obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 };
-		}
-		if ( "left" in obj ) {
-			this.offset.click.left = obj.left + this.margins.left;
-		}
-		if ( "right" in obj ) {
-			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
-		}
-		if ( "top" in obj ) {
-			this.offset.click.top = obj.top + this.margins.top;
-		}
-		if ( "bottom" in obj ) {
-			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
-		}
-	},
-
-	_isRootNode: function( element ) {
-		return ( /(html|body)/i ).test( element.tagName ) || element === this.document[ 0 ];
-	},
-
-	_getParentOffset: function() {
-
-		//Get the offsetParent and cache its position
-		var po = this.offsetParent.offset(),
-			document = this.document[ 0 ];
-
-		// This is a special case where we need to modify a offset calculated on start, since the
-		// following happened:
-		// 1. The position of the helper is absolute, so it's position is calculated based on the
-		// next positioned parent
-		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't
-		// the document, which means that the scroll is included in the initial calculation of the
-		// offset of the parent, and never recalculated upon drag
-		if ( this.cssPosition === "absolute" && this.scrollParent[ 0 ] !== document &&
-				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) {
-			po.left += this.scrollParent.scrollLeft();
-			po.top += this.scrollParent.scrollTop();
-		}
-
-		if ( this._isRootNode( this.offsetParent[ 0 ] ) ) {
-			po = { top: 0, left: 0 };
-		}
-
-		return {
-			top: po.top + ( parseInt( this.offsetParent.css( "borderTopWidth" ), 10 ) || 0 ),
-			left: po.left + ( parseInt( this.offsetParent.css( "borderLeftWidth" ), 10 ) || 0 )
-		};
-
-	},
-
-	_getRelativeOffset: function() {
-		if ( this.cssPosition !== "relative" ) {
-			return { top: 0, left: 0 };
-		}
-
-		var p = this.element.position(),
-			scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] );
-
-		return {
-			top: p.top - ( parseInt( this.helper.css( "top" ), 10 ) || 0 ) +
-				( !scrollIsRootNode ? this.scrollParent.scrollTop() : 0 ),
-			left: p.left - ( parseInt( this.helper.css( "left" ), 10 ) || 0 ) +
-				( !scrollIsRootNode ? this.scrollParent.scrollLeft() : 0 )
-		};
-
-	},
-
-	_cacheMargins: function() {
-		this.margins = {
-			left: ( parseInt( this.element.css( "marginLeft" ), 10 ) || 0 ),
-			top: ( parseInt( this.element.css( "marginTop" ), 10 ) || 0 ),
-			right: ( parseInt( this.element.css( "marginRight" ), 10 ) || 0 ),
-			bottom: ( parseInt( this.element.css( "marginBottom" ), 10 ) || 0 )
-		};
-	},
-
-	_cacheHelperProportions: function() {
-		this.helperProportions = {
-			width: this.helper.outerWidth(),
-			height: this.helper.outerHeight()
-		};
-	},
-
-	_setContainment: function() {
-
-		var isUserScrollable, c, ce,
-			o = this.options,
-			document = this.document[ 0 ];
-
-		this.relativeContainer = null;
-
-		if ( !o.containment ) {
-			this.containment = null;
-			return;
-		}
-
-		if ( o.containment === "window" ) {
-			this.containment = [
-				$( window ).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
-				$( window ).scrollTop() - this.offset.relative.top - this.offset.parent.top,
-				$( window ).scrollLeft() + $( window ).width() -
-					this.helperProportions.width - this.margins.left,
-				$( window ).scrollTop() +
-					( $( window ).height() || document.body.parentNode.scrollHeight ) -
-					this.helperProportions.height - this.margins.top
-			];
-			return;
-		}
-
-		if ( o.containment === "document" ) {
-			this.containment = [
-				0,
-				0,
-				$( document ).width() - this.helperProportions.width - this.margins.left,
-				( $( document ).height() || document.body.parentNode.scrollHeight ) -
-					this.helperProportions.height - this.margins.top
-			];
-			return;
-		}
-
-		if ( o.containment.constructor === Array ) {
-			this.containment = o.containment;
-			return;
-		}
-
-		if ( o.containment === "parent" ) {
-			o.containment = this.helper[ 0 ].parentNode;
-		}
-
-		c = $( o.containment );
-		ce = c[ 0 ];
-
-		if ( !ce ) {
-			return;
-		}
-
-		isUserScrollable = /(scroll|auto)/.test( c.css( "overflow" ) );
-
-		this.containment = [
-			( parseInt( c.css( "borderLeftWidth" ), 10 ) || 0 ) +
-				( parseInt( c.css( "paddingLeft" ), 10 ) || 0 ),
-			( parseInt( c.css( "borderTopWidth" ), 10 ) || 0 ) +
-				( parseInt( c.css( "paddingTop" ), 10 ) || 0 ),
-			( isUserScrollable ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) -
-				( parseInt( c.css( "borderRightWidth" ), 10 ) || 0 ) -
-				( parseInt( c.css( "paddingRight" ), 10 ) || 0 ) -
-				this.helperProportions.width -
-				this.margins.left -
-				this.margins.right,
-			( isUserScrollable ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) -
-				( parseInt( c.css( "borderBottomWidth" ), 10 ) || 0 ) -
-				( parseInt( c.css( "paddingBottom" ), 10 ) || 0 ) -
-				this.helperProportions.height -
-				this.margins.top -
-				this.margins.bottom
-		];
-		this.relativeContainer = c;
-	},
-
-	_convertPositionTo: function( d, pos ) {
-
-		if ( !pos ) {
-			pos = this.position;
-		}
-
-		var mod = d === "absolute" ? 1 : -1,
-			scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] );
-
-		return {
-			top: (
-
-				// The absolute mouse position
-				pos.top	+
-
-				// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.relative.top * mod +
-
-				// The offsetParent's offset without borders (offset + border)
-				this.offset.parent.top * mod -
-				( ( this.cssPosition === "fixed" ?
-					-this.offset.scroll.top :
-					( scrollIsRootNode ? 0 : this.offset.scroll.top ) ) * mod )
-			),
-			left: (
-
-				// The absolute mouse position
-				pos.left +
-
-				// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.relative.left * mod +
-
-				// The offsetParent's offset without borders (offset + border)
-				this.offset.parent.left * mod	-
-				( ( this.cssPosition === "fixed" ?
-					-this.offset.scroll.left :
-					( scrollIsRootNode ? 0 : this.offset.scroll.left ) ) * mod )
-			)
-		};
-
-	},
-
-	_generatePosition: function( event, constrainPosition ) {
-
-		var containment, co, top, left,
-			o = this.options,
-			scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] ),
-			pageX = event.pageX,
-			pageY = event.pageY;
-
-		// Cache the scroll
-		if ( !scrollIsRootNode || !this.offset.scroll ) {
-			this.offset.scroll = {
-				top: this.scrollParent.scrollTop(),
-				left: this.scrollParent.scrollLeft()
-			};
-		}
-
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-
-		// If we are not dragging yet, we won't check for options
-		if ( constrainPosition ) {
-			if ( this.containment ) {
-				if ( this.relativeContainer ) {
-					co = this.relativeContainer.offset();
-					containment = [
-						this.containment[ 0 ] + co.left,
-						this.containment[ 1 ] + co.top,
-						this.containment[ 2 ] + co.left,
-						this.containment[ 3 ] + co.top
-					];
-				} else {
-					containment = this.containment;
-				}
-
-				if ( event.pageX - this.offset.click.left < containment[ 0 ] ) {
-					pageX = containment[ 0 ] + this.offset.click.left;
-				}
-				if ( event.pageY - this.offset.click.top < containment[ 1 ] ) {
-					pageY = containment[ 1 ] + this.offset.click.top;
-				}
-				if ( event.pageX - this.offset.click.left > containment[ 2 ] ) {
-					pageX = containment[ 2 ] + this.offset.click.left;
-				}
-				if ( event.pageY - this.offset.click.top > containment[ 3 ] ) {
-					pageY = containment[ 3 ] + this.offset.click.top;
-				}
-			}
-
-			if ( o.grid ) {
-
-				//Check for grid elements set to 0 to prevent divide by 0 error causing invalid
-				// argument errors in IE (see ticket #6950)
-				top = o.grid[ 1 ] ? this.originalPageY + Math.round( ( pageY -
-					this.originalPageY ) / o.grid[ 1 ] ) * o.grid[ 1 ] : this.originalPageY;
-				pageY = containment ? ( ( top - this.offset.click.top >= containment[ 1 ] ||
-					top - this.offset.click.top > containment[ 3 ] ) ?
-						top :
-						( ( top - this.offset.click.top >= containment[ 1 ] ) ?
-							top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) : top;
-
-				left = o.grid[ 0 ] ? this.originalPageX +
-					Math.round( ( pageX - this.originalPageX ) / o.grid[ 0 ] ) * o.grid[ 0 ] :
-					this.originalPageX;
-				pageX = containment ? ( ( left - this.offset.click.left >= containment[ 0 ] ||
-					left - this.offset.click.left > containment[ 2 ] ) ?
-						left :
-						( ( left - this.offset.click.left >= containment[ 0 ] ) ?
-							left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) : left;
-			}
-
-			if ( o.axis === "y" ) {
-				pageX = this.originalPageX;
-			}
-
-			if ( o.axis === "x" ) {
-				pageY = this.originalPageY;
-			}
-		}
-
-		return {
-			top: (
-
-				// The absolute mouse position
-				pageY -
-
-				// Click offset (relative to the element)
-				this.offset.click.top -
-
-				// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.relative.top -
-
-				// The offsetParent's offset without borders (offset + border)
-				this.offset.parent.top +
-				( this.cssPosition === "fixed" ?
-					-this.offset.scroll.top :
-					( scrollIsRootNode ? 0 : this.offset.scroll.top ) )
-			),
-			left: (
-
-				// The absolute mouse position
-				pageX -
-
-				// Click offset (relative to the element)
-				this.offset.click.left -
-
-				// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.relative.left -
-
-				// The offsetParent's offset without borders (offset + border)
-				this.offset.parent.left +
-				( this.cssPosition === "fixed" ?
-					-this.offset.scroll.left :
-					( scrollIsRootNode ? 0 : this.offset.scroll.left ) )
-			)
-		};
-
-	},
-
-	_clear: function() {
-		this._removeClass( this.helper, "ui-draggable-dragging" );
-		if ( this.helper[ 0 ] !== this.element[ 0 ] && !this.cancelHelperRemoval ) {
-			this.helper.remove();
-		}
-		this.helper = null;
-		this.cancelHelperRemoval = false;
-		if ( this.destroyOnClear ) {
-			this.destroy();
-		}
-	},
-
-	// From now on bulk stuff - mainly helpers
-
-	_trigger: function( type, event, ui ) {
-		ui = ui || this._uiHash();
-		$.ui.plugin.call( this, type, [ event, ui, this ], true );
-
-		// Absolute position and offset (see #6884 ) have to be recalculated after plugins
-		if ( /^(drag|start|stop)/.test( type ) ) {
-			this.positionAbs = this._convertPositionTo( "absolute" );
-			ui.offset = this.positionAbs;
-		}
-		return $.Widget.prototype._trigger.call( this, type, event, ui );
-	},
-
-	plugins: {},
-
-	_uiHash: function() {
-		return {
-			helper: this.helper,
-			position: this.position,
-			originalPosition: this.originalPosition,
-			offset: this.positionAbs
-		};
-	}
-
-} );
-
-$.ui.plugin.add( "draggable", "connectToSortable", {
-	start: function( event, ui, draggable ) {
-		var uiSortable = $.extend( {}, ui, {
-			item: draggable.element
-		} );
-
-		draggable.sortables = [];
-		$( draggable.options.connectToSortable ).each( function() {
-			var sortable = $( this ).sortable( "instance" );
-
-			if ( sortable && !sortable.options.disabled ) {
-				draggable.sortables.push( sortable );
-
-				// RefreshPositions is called at drag start to refresh the containerCache
-				// which is used in drag. This ensures it's initialized and synchronized
-				// with any changes that might have happened on the page since initialization.
-				sortable.refreshPositions();
-				sortable._trigger( "activate", event, uiSortable );
-			}
-		} );
-	},
-	stop: function( event, ui, draggable ) {
-		var uiSortable = $.extend( {}, ui, {
-			item: draggable.element
-		} );
-
-		draggable.cancelHelperRemoval = false;
-
-		$.each( draggable.sortables, function() {
-			var sortable = this;
-
-			if ( sortable.isOver ) {
-				sortable.isOver = 0;
-
-				// Allow this sortable to handle removing the helper
-				draggable.cancelHelperRemoval = true;
-				sortable.cancelHelperRemoval = false;
-
-				// Use _storedCSS To restore properties in the sortable,
-				// as this also handles revert (#9675) since the draggable
-				// may have modified them in unexpected ways (#8809)
-				sortable._storedCSS = {
-					position: sortable.placeholder.css( "position" ),
-					top: sortable.placeholder.css( "top" ),
-					left: sortable.placeholder.css( "left" )
-				};
-
-				sortable._mouseStop( event );
-
-				// Once drag has ended, the sortable should return to using
-				// its original helper, not the shared helper from draggable
-				sortable.options.helper = sortable.options._helper;
-			} else {
-
-				// Prevent this Sortable from removing the helper.
-				// However, don't set the draggable to remove the helper
-				// either as another connected Sortable may yet handle the removal.
-				sortable.cancelHelperRemoval = true;
-
-				sortable._trigger( "deactivate", event, uiSortable );
-			}
-		} );
-	},
-	drag: function( event, ui, draggable ) {
-		$.each( draggable.sortables, function() {
-			var innermostIntersecting = false,
-				sortable = this;
-
-			// Copy over variables that sortable's _intersectsWith uses
-			sortable.positionAbs = draggable.positionAbs;
-			sortable.helperProportions = draggable.helperProportions;
-			sortable.offset.click = draggable.offset.click;
-
-			if ( sortable._intersectsWith( sortable.containerCache ) ) {
-				innermostIntersecting = true;
-
-				$.each( draggable.sortables, function() {
-
-					// Copy over variables that sortable's _intersectsWith uses
-					this.positionAbs = draggable.positionAbs;
-					this.helperProportions = draggable.helperProportions;
-					this.offset.click = draggable.offset.click;
-
-					if ( this !== sortable &&
-							this._intersectsWith( this.containerCache ) &&
-							$.contains( sortable.element[ 0 ], this.element[ 0 ] ) ) {
-						innermostIntersecting = false;
-					}
-
-					return innermostIntersecting;
-				} );
-			}
-
-			if ( innermostIntersecting ) {
-
-				// If it intersects, we use a little isOver variable and set it once,
-				// so that the move-in stuff gets fired only once.
-				if ( !sortable.isOver ) {
-					sortable.isOver = 1;
-
-					// Store draggable's parent in case we need to reappend to it later.
-					draggable._parent = ui.helper.parent();
-
-					sortable.currentItem = ui.helper
-						.appendTo( sortable.element )
-						.data( "ui-sortable-item", true );
-
-					// Store helper option to later restore it
-					sortable.options._helper = sortable.options.helper;
-
-					sortable.options.helper = function() {
-						return ui.helper[ 0 ];
-					};
-
-					// Fire the start events of the sortable with our passed browser event,
-					// and our own helper (so it doesn't create a new one)
-					event.target = sortable.currentItem[ 0 ];
-					sortable._mouseCapture( event, true );
-					sortable._mouseStart( event, true, true );
-
-					// Because the browser event is way off the new appended portlet,
-					// modify necessary variables to reflect the changes
-					sortable.offset.click.top = draggable.offset.click.top;
-					sortable.offset.click.left = draggable.offset.click.left;
-					sortable.offset.parent.left -= draggable.offset.parent.left -
-						sortable.offset.parent.left;
-					sortable.offset.parent.top -= draggable.offset.parent.top -
-						sortable.offset.parent.top;
-
-					draggable._trigger( "toSortable", event );
-
-					// Inform draggable that the helper is in a valid drop zone,
-					// used solely in the revert option to handle "valid/invalid".
-					draggable.dropped = sortable.element;
-
-					// Need to refreshPositions of all sortables in the case that
-					// adding to one sortable changes the location of the other sortables (#9675)
-					$.each( draggable.sortables, function() {
-						this.refreshPositions();
-					} );
-
-					// Hack so receive/update callbacks work (mostly)
-					draggable.currentItem = draggable.element;
-					sortable.fromOutside = draggable;
-				}
-
-				if ( sortable.currentItem ) {
-					sortable._mouseDrag( event );
-
-					// Copy the sortable's position because the draggable's can potentially reflect
-					// a relative position, while sortable is always absolute, which the dragged
-					// element has now become. (#8809)
-					ui.position = sortable.position;
-				}
-			} else {
-
-				// If it doesn't intersect with the sortable, and it intersected before,
-				// we fake the drag stop of the sortable, but make sure it doesn't remove
-				// the helper by using cancelHelperRemoval.
-				if ( sortable.isOver ) {
-
-					sortable.isOver = 0;
-					sortable.cancelHelperRemoval = true;
-
-					// Calling sortable's mouseStop would trigger a revert,
-					// so revert must be temporarily false until after mouseStop is called.
-					sortable.options._revert = sortable.options.revert;
-					sortable.options.revert = false;
-
-					sortable._trigger( "out", event, sortable._uiHash( sortable ) );
-					sortable._mouseStop( event, true );
-
-					// Restore sortable behaviors that were modfied
-					// when the draggable entered the sortable area (#9481)
-					sortable.options.revert = sortable.options._revert;
-					sortable.options.helper = sortable.options._helper;
-
-					if ( sortable.placeholder ) {
-						sortable.placeholder.remove();
-					}
-
-					// Restore and recalculate the draggable's offset considering the sortable
-					// may have modified them in unexpected ways. (#8809, #10669)
-					ui.helper.appendTo( draggable._parent );
-					draggable._refreshOffsets( event );
-					ui.position = draggable._generatePosition( event, true );
-
-					draggable._trigger( "fromSortable", event );
-
-					// Inform draggable that the helper is no longer in a valid drop zone
-					draggable.dropped = false;
-
-					// Need to refreshPositions of all sortables just in case removing
-					// from one sortable changes the location of other sortables (#9675)
-					$.each( draggable.sortables, function() {
-						this.refreshPositions();
-					} );
-				}
-			}
-		} );
-	}
-} );
-
-$.ui.plugin.add( "draggable", "cursor", {
-	start: function( event, ui, instance ) {
-		var t = $( "body" ),
-			o = instance.options;
-
-		if ( t.css( "cursor" ) ) {
-			o._cursor = t.css( "cursor" );
-		}
-		t.css( "cursor", o.cursor );
-	},
-	stop: function( event, ui, instance ) {
-		var o = instance.options;
-		if ( o._cursor ) {
-			$( "body" ).css( "cursor", o._cursor );
-		}
-	}
-} );
-
-$.ui.plugin.add( "draggable", "opacity", {
-	start: function( event, ui, instance ) {
-		var t = $( ui.helper ),
-			o = instance.options;
-		if ( t.css( "opacity" ) ) {
-			o._opacity = t.css( "opacity" );
-		}
-		t.css( "opacity", o.opacity );
-	},
-	stop: function( event, ui, instance ) {
-		var o = instance.options;
-		if ( o._opacity ) {
-			$( ui.helper ).css( "opacity", o._opacity );
-		}
-	}
-} );
-
-$.ui.plugin.add( "draggable", "scroll", {
-	start: function( event, ui, i ) {
-		if ( !i.scrollParentNotHidden ) {
-			i.scrollParentNotHidden = i.helper.scrollParent( false );
-		}
-
-		if ( i.scrollParentNotHidden[ 0 ] !== i.document[ 0 ] &&
-				i.scrollParentNotHidden[ 0 ].tagName !== "HTML" ) {
-			i.overflowOffset = i.scrollParentNotHidden.offset();
-		}
-	},
-	drag: function( event, ui, i  ) {
-
-		var o = i.options,
-			scrolled = false,
-			scrollParent = i.scrollParentNotHidden[ 0 ],
-			document = i.document[ 0 ];
-
-		if ( scrollParent !== document && scrollParent.tagName !== "HTML" ) {
-			if ( !o.axis || o.axis !== "x" ) {
-				if ( ( i.overflowOffset.top + scrollParent.offsetHeight ) - event.pageY <
-						o.scrollSensitivity ) {
-					scrollParent.scrollTop = scrolled = scrollParent.scrollTop + o.scrollSpeed;
-				} else if ( event.pageY - i.overflowOffset.top < o.scrollSensitivity ) {
-					scrollParent.scrollTop = scrolled = scrollParent.scrollTop - o.scrollSpeed;
-				}
-			}
-
-			if ( !o.axis || o.axis !== "y" ) {
-				if ( ( i.overflowOffset.left + scrollParent.offsetWidth ) - event.pageX <
-						o.scrollSensitivity ) {
-					scrollParent.scrollLeft = scrolled = scrollParent.scrollLeft + o.scrollSpeed;
-				} else if ( event.pageX - i.overflowOffset.left < o.scrollSensitivity ) {
-					scrollParent.scrollLeft = scrolled = scrollParent.scrollLeft - o.scrollSpeed;
-				}
-			}
-
-		} else {
-
-			if ( !o.axis || o.axis !== "x" ) {
-				if ( event.pageY - $( document ).scrollTop() < o.scrollSensitivity ) {
-					scrolled = $( document ).scrollTop( $( document ).scrollTop() - o.scrollSpeed );
-				} else if ( $( window ).height() - ( event.pageY - $( document ).scrollTop() ) <
-						o.scrollSensitivity ) {
-					scrolled = $( document ).scrollTop( $( document ).scrollTop() + o.scrollSpeed );
-				}
-			}
-
-			if ( !o.axis || o.axis !== "y" ) {
-				if ( event.pageX - $( document ).scrollLeft() < o.scrollSensitivity ) {
-					scrolled = $( document ).scrollLeft(
-						$( document ).scrollLeft() - o.scrollSpeed
-					);
-				} else if ( $( window ).width() - ( event.pageX - $( document ).scrollLeft() ) <
-						o.scrollSensitivity ) {
-					scrolled = $( document ).scrollLeft(
-						$( document ).scrollLeft() + o.scrollSpeed
-					);
-				}
-			}
-
-		}
-
-		if ( scrolled !== false && $.ui.ddmanager && !o.dropBehaviour ) {
-			$.ui.ddmanager.prepareOffsets( i, event );
-		}
-
-	}
-} );
-
-$.ui.plugin.add( "draggable", "snap", {
-	start: function( event, ui, i ) {
-
-		var o = i.options;
-
-		i.snapElements = [];
-
-		$( o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap )
-			.each( function() {
-				var $t = $( this ),
-					$o = $t.offset();
-				if ( this !== i.element[ 0 ] ) {
-					i.snapElements.push( {
-						item: this,
-						width: $t.outerWidth(), height: $t.outerHeight(),
-						top: $o.top, left: $o.left
-					} );
-				}
-			} );
-
-	},
-	drag: function( event, ui, inst ) {
-
-		var ts, bs, ls, rs, l, r, t, b, i, first,
-			o = inst.options,
-			d = o.snapTolerance,
-			x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
-			y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
-
-		for ( i = inst.snapElements.length - 1; i >= 0; i-- ) {
-
-			l = inst.snapElements[ i ].left - inst.margins.left;
-			r = l + inst.snapElements[ i ].width;
-			t = inst.snapElements[ i ].top - inst.margins.top;
-			b = t + inst.snapElements[ i ].height;
-
-			if ( x2 < l - d || x1 > r + d || y2 < t - d || y1 > b + d ||
-					!$.contains( inst.snapElements[ i ].item.ownerDocument,
-					inst.snapElements[ i ].item ) ) {
-				if ( inst.snapElements[ i ].snapping ) {
-					( inst.options.snap.release &&
-						inst.options.snap.release.call(
-							inst.element,
-							event,
-							$.extend( inst._uiHash(), { snapItem: inst.snapElements[ i ].item } )
-						) );
-				}
-				inst.snapElements[ i ].snapping = false;
-				continue;
-			}
-
-			if ( o.snapMode !== "inner" ) {
-				ts = Math.abs( t - y2 ) <= d;
-				bs = Math.abs( b - y1 ) <= d;
-				ls = Math.abs( l - x2 ) <= d;
-				rs = Math.abs( r - x1 ) <= d;
-				if ( ts ) {
-					ui.position.top = inst._convertPositionTo( "relative", {
-						top: t - inst.helperProportions.height,
-						left: 0
-					} ).top;
-				}
-				if ( bs ) {
-					ui.position.top = inst._convertPositionTo( "relative", {
-						top: b,
-						left: 0
-					} ).top;
-				}
-				if ( ls ) {
-					ui.position.left = inst._convertPositionTo( "relative", {
-						top: 0,
-						left: l - inst.helperProportions.width
-					} ).left;
-				}
-				if ( rs ) {
-					ui.position.left = inst._convertPositionTo( "relative", {
-						top: 0,
-						left: r
-					} ).left;
-				}
-			}
-
-			first = ( ts || bs || ls || rs );
-
-			if ( o.snapMode !== "outer" ) {
-				ts = Math.abs( t - y1 ) <= d;
-				bs = Math.abs( b - y2 ) <= d;
-				ls = Math.abs( l - x1 ) <= d;
-				rs = Math.abs( r - x2 ) <= d;
-				if ( ts ) {
-					ui.position.top = inst._convertPositionTo( "relative", {
-						top: t,
-						left: 0
-					} ).top;
-				}
-				if ( bs ) {
-					ui.position.top = inst._convertPositionTo( "relative", {
-						top: b - inst.helperProportions.height,
-						left: 0
-					} ).top;
-				}
-				if ( ls ) {
-					ui.position.left = inst._convertPositionTo( "relative", {
-						top: 0,
-						left: l
-					} ).left;
-				}
-				if ( rs ) {
-					ui.position.left = inst._convertPositionTo( "relative", {
-						top: 0,
-						left: r - inst.helperProportions.width
-					} ).left;
-				}
-			}
-
-			if ( !inst.snapElements[ i ].snapping && ( ts || bs || ls || rs || first ) ) {
-				( inst.options.snap.snap &&
-					inst.options.snap.snap.call(
-						inst.element,
-						event,
-						$.extend( inst._uiHash(), {
-							snapItem: inst.snapElements[ i ].item
-						} ) ) );
-			}
-			inst.snapElements[ i ].snapping = ( ts || bs || ls || rs || first );
-
-		}
-
-	}
-} );
-
-$.ui.plugin.add( "draggable", "stack", {
-	start: function( event, ui, instance ) {
-		var min,
-			o = instance.options,
-			group = $.makeArray( $( o.stack ) ).sort( function( a, b ) {
-				return ( parseInt( $( a ).css( "zIndex" ), 10 ) || 0 ) -
-					( parseInt( $( b ).css( "zIndex" ), 10 ) || 0 );
-			} );
-
-		if ( !group.length ) { return; }
-
-		min = parseInt( $( group[ 0 ] ).css( "zIndex" ), 10 ) || 0;
-		$( group ).each( function( i ) {
-			$( this ).css( "zIndex", min + i );
-		} );
-		this.css( "zIndex", ( min + group.length ) );
-	}
-} );
-
-$.ui.plugin.add( "draggable", "zIndex", {
-	start: function( event, ui, instance ) {
-		var t = $( ui.helper ),
-			o = instance.options;
-
-		if ( t.css( "zIndex" ) ) {
-			o._zIndex = t.css( "zIndex" );
-		}
-		t.css( "zIndex", o.zIndex );
-	},
-	stop: function( event, ui, instance ) {
-		var o = instance.options;
-
-		if ( o._zIndex ) {
-			$( ui.helper ).css( "zIndex", o._zIndex );
-		}
-	}
-} );
-
-var widgetsDraggable = $.ui.draggable;
-
-
-/*!
- * jQuery UI Resizable 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Resizable
-//>>group: Interactions
-//>>description: Enables resize functionality for any element.
-//>>docs: http://api.jqueryui.com/resizable/
-//>>demos: http://jqueryui.com/resizable/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/resizable.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-$.widget( "ui.resizable", $.ui.mouse, {
-	version: "1.12.1",
-	widgetEventPrefix: "resize",
-	options: {
-		alsoResize: false,
-		animate: false,
-		animateDuration: "slow",
-		animateEasing: "swing",
-		aspectRatio: false,
-		autoHide: false,
-		classes: {
-			"ui-resizable-se": "ui-icon ui-icon-gripsmall-diagonal-se"
-		},
-		containment: false,
-		ghost: false,
-		grid: false,
-		handles: "e,s,se",
-		helper: false,
-		maxHeight: null,
-		maxWidth: null,
-		minHeight: 10,
-		minWidth: 10,
-
-		// See #7960
-		zIndex: 90,
-
-		// Callbacks
-		resize: null,
-		start: null,
-		stop: null
-	},
-
-	_num: function( value ) {
-		return parseFloat( value ) || 0;
-	},
-
-	_isNumber: function( value ) {
-		return !isNaN( parseFloat( value ) );
-	},
-
-	_hasScroll: function( el, a ) {
-
-		if ( $( el ).css( "overflow" ) === "hidden" ) {
-			return false;
-		}
-
-		var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
-			has = false;
-
-		if ( el[ scroll ] > 0 ) {
-			return true;
-		}
-
-		// TODO: determine which cases actually cause this to happen
-		// if the element doesn't have the scroll set, see if it's possible to
-		// set the scroll
-		el[ scroll ] = 1;
-		has = ( el[ scroll ] > 0 );
-		el[ scroll ] = 0;
-		return has;
-	},
-
-	_create: function() {
-
-		var margins,
-			o = this.options,
-			that = this;
-		this._addClass( "ui-resizable" );
-
-		$.extend( this, {
-			_aspectRatio: !!( o.aspectRatio ),
-			aspectRatio: o.aspectRatio,
-			originalElement: this.element,
-			_proportionallyResizeElements: [],
-			_helper: o.helper || o.ghost || o.animate ? o.helper || "ui-resizable-helper" : null
-		} );
-
-		// Wrap the element if it cannot hold child nodes
-		if ( this.element[ 0 ].nodeName.match( /^(canvas|textarea|input|select|button|img)$/i ) ) {
-
-			this.element.wrap(
-				$( "<div class='ui-wrapper' style='overflow: hidden;'></div>" ).css( {
-					position: this.element.css( "position" ),
-					width: this.element.outerWidth(),
-					height: this.element.outerHeight(),
-					top: this.element.css( "top" ),
-					left: this.element.css( "left" )
-				} )
-			);
-
-			this.element = this.element.parent().data(
-				"ui-resizable", this.element.resizable( "instance" )
-			);
-
-			this.elementIsWrapper = true;
-
-			margins = {
-				marginTop: this.originalElement.css( "marginTop" ),
-				marginRight: this.originalElement.css( "marginRight" ),
-				marginBottom: this.originalElement.css( "marginBottom" ),
-				marginLeft: this.originalElement.css( "marginLeft" )
-			};
-
-			this.element.css( margins );
-			this.originalElement.css( "margin", 0 );
-
-			// support: Safari
-			// Prevent Safari textarea resize
-			this.originalResizeStyle = this.originalElement.css( "resize" );
-			this.originalElement.css( "resize", "none" );
-
-			this._proportionallyResizeElements.push( this.originalElement.css( {
-				position: "static",
-				zoom: 1,
-				display: "block"
-			} ) );
-
-			// Support: IE9
-			// avoid IE jump (hard set the margin)
-			this.originalElement.css( margins );
-
-			this._proportionallyResize();
-		}
-
-		this._setupHandles();
-
-		if ( o.autoHide ) {
-			$( this.element )
-				.on( "mouseenter", function() {
-					if ( o.disabled ) {
-						return;
-					}
-					that._removeClass( "ui-resizable-autohide" );
-					that._handles.show();
-				} )
-				.on( "mouseleave", function() {
-					if ( o.disabled ) {
-						return;
-					}
-					if ( !that.resizing ) {
-						that._addClass( "ui-resizable-autohide" );
-						that._handles.hide();
-					}
-				} );
-		}
-
-		this._mouseInit();
-	},
-
-	_destroy: function() {
-
-		this._mouseDestroy();
-
-		var wrapper,
-			_destroy = function( exp ) {
-				$( exp )
-					.removeData( "resizable" )
-					.removeData( "ui-resizable" )
-					.off( ".resizable" )
-					.find( ".ui-resizable-handle" )
-						.remove();
-			};
-
-		// TODO: Unwrap at same DOM position
-		if ( this.elementIsWrapper ) {
-			_destroy( this.element );
-			wrapper = this.element;
-			this.originalElement.css( {
-				position: wrapper.css( "position" ),
-				width: wrapper.outerWidth(),
-				height: wrapper.outerHeight(),
-				top: wrapper.css( "top" ),
-				left: wrapper.css( "left" )
-			} ).insertAfter( wrapper );
-			wrapper.remove();
-		}
-
-		this.originalElement.css( "resize", this.originalResizeStyle );
-		_destroy( this.originalElement );
-
-		return this;
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-
-		switch ( key ) {
-		case "handles":
-			this._removeHandles();
-			this._setupHandles();
-			break;
-		default:
-			break;
-		}
-	},
-
-	_setupHandles: function() {
-		var o = this.options, handle, i, n, hname, axis, that = this;
-		this.handles = o.handles ||
-			( !$( ".ui-resizable-handle", this.element ).length ?
-				"e,s,se" : {
-					n: ".ui-resizable-n",
-					e: ".ui-resizable-e",
-					s: ".ui-resizable-s",
-					w: ".ui-resizable-w",
-					se: ".ui-resizable-se",
-					sw: ".ui-resizable-sw",
-					ne: ".ui-resizable-ne",
-					nw: ".ui-resizable-nw"
-				} );
-
-		this._handles = $();
-		if ( this.handles.constructor === String ) {
-
-			if ( this.handles === "all" ) {
-				this.handles = "n,e,s,w,se,sw,ne,nw";
-			}
-
-			n = this.handles.split( "," );
-			this.handles = {};
-
-			for ( i = 0; i < n.length; i++ ) {
-
-				handle = $.trim( n[ i ] );
-				hname = "ui-resizable-" + handle;
-				axis = $( "<div>" );
-				this._addClass( axis, "ui-resizable-handle " + hname );
-
-				axis.css( { zIndex: o.zIndex } );
-
-				this.handles[ handle ] = ".ui-resizable-" + handle;
-				this.element.append( axis );
-			}
-
-		}
-
-		this._renderAxis = function( target ) {
-
-			var i, axis, padPos, padWrapper;
-
-			target = target || this.element;
-
-			for ( i in this.handles ) {
-
-				if ( this.handles[ i ].constructor === String ) {
-					this.handles[ i ] = this.element.children( this.handles[ i ] ).first().show();
-				} else if ( this.handles[ i ].jquery || this.handles[ i ].nodeType ) {
-					this.handles[ i ] = $( this.handles[ i ] );
-					this._on( this.handles[ i ], { "mousedown": that._mouseDown } );
-				}
-
-				if ( this.elementIsWrapper &&
-						this.originalElement[ 0 ]
-							.nodeName
-							.match( /^(textarea|input|select|button)$/i ) ) {
-					axis = $( this.handles[ i ], this.element );
-
-					padWrapper = /sw|ne|nw|se|n|s/.test( i ) ?
-						axis.outerHeight() :
-						axis.outerWidth();
-
-					padPos = [ "padding",
-						/ne|nw|n/.test( i ) ? "Top" :
-						/se|sw|s/.test( i ) ? "Bottom" :
-						/^e$/.test( i ) ? "Right" : "Left" ].join( "" );
-
-					target.css( padPos, padWrapper );
-
-					this._proportionallyResize();
-				}
-
-				this._handles = this._handles.add( this.handles[ i ] );
-			}
-		};
-
-		// TODO: make renderAxis a prototype function
-		this._renderAxis( this.element );
-
-		this._handles = this._handles.add( this.element.find( ".ui-resizable-handle" ) );
-		this._handles.disableSelection();
-
-		this._handles.on( "mouseover", function() {
-			if ( !that.resizing ) {
-				if ( this.className ) {
-					axis = this.className.match( /ui-resizable-(se|sw|ne|nw|n|e|s|w)/i );
-				}
-				that.axis = axis && axis[ 1 ] ? axis[ 1 ] : "se";
-			}
-		} );
-
-		if ( o.autoHide ) {
-			this._handles.hide();
-			this._addClass( "ui-resizable-autohide" );
-		}
-	},
-
-	_removeHandles: function() {
-		this._handles.remove();
-	},
-
-	_mouseCapture: function( event ) {
-		var i, handle,
-			capture = false;
-
-		for ( i in this.handles ) {
-			handle = $( this.handles[ i ] )[ 0 ];
-			if ( handle === event.target || $.contains( handle, event.target ) ) {
-				capture = true;
-			}
-		}
-
-		return !this.options.disabled && capture;
-	},
-
-	_mouseStart: function( event ) {
-
-		var curleft, curtop, cursor,
-			o = this.options,
-			el = this.element;
-
-		this.resizing = true;
-
-		this._renderProxy();
-
-		curleft = this._num( this.helper.css( "left" ) );
-		curtop = this._num( this.helper.css( "top" ) );
-
-		if ( o.containment ) {
-			curleft += $( o.containment ).scrollLeft() || 0;
-			curtop += $( o.containment ).scrollTop() || 0;
-		}
-
-		this.offset = this.helper.offset();
-		this.position = { left: curleft, top: curtop };
-
-		this.size = this._helper ? {
-				width: this.helper.width(),
-				height: this.helper.height()
-			} : {
-				width: el.width(),
-				height: el.height()
-			};
-
-		this.originalSize = this._helper ? {
-				width: el.outerWidth(),
-				height: el.outerHeight()
-			} : {
-				width: el.width(),
-				height: el.height()
-			};
-
-		this.sizeDiff = {
-			width: el.outerWidth() - el.width(),
-			height: el.outerHeight() - el.height()
-		};
-
-		this.originalPosition = { left: curleft, top: curtop };
-		this.originalMousePosition = { left: event.pageX, top: event.pageY };
-
-		this.aspectRatio = ( typeof o.aspectRatio === "number" ) ?
-			o.aspectRatio :
-			( ( this.originalSize.width / this.originalSize.height ) || 1 );
-
-		cursor = $( ".ui-resizable-" + this.axis ).css( "cursor" );
-		$( "body" ).css( "cursor", cursor === "auto" ? this.axis + "-resize" : cursor );
-
-		this._addClass( "ui-resizable-resizing" );
-		this._propagate( "start", event );
-		return true;
-	},
-
-	_mouseDrag: function( event ) {
-
-		var data, props,
-			smp = this.originalMousePosition,
-			a = this.axis,
-			dx = ( event.pageX - smp.left ) || 0,
-			dy = ( event.pageY - smp.top ) || 0,
-			trigger = this._change[ a ];
-
-		this._updatePrevProperties();
-
-		if ( !trigger ) {
-			return false;
-		}
-
-		data = trigger.apply( this, [ event, dx, dy ] );
-
-		this._updateVirtualBoundaries( event.shiftKey );
-		if ( this._aspectRatio || event.shiftKey ) {
-			data = this._updateRatio( data, event );
-		}
-
-		data = this._respectSize( data, event );
-
-		this._updateCache( data );
-
-		this._propagate( "resize", event );
-
-		props = this._applyChanges();
-
-		if ( !this._helper && this._proportionallyResizeElements.length ) {
-			this._proportionallyResize();
-		}
-
-		if ( !$.isEmptyObject( props ) ) {
-			this._updatePrevProperties();
-			this._trigger( "resize", event, this.ui() );
-			this._applyChanges();
-		}
-
-		return false;
-	},
-
-	_mouseStop: function( event ) {
-
-		this.resizing = false;
-		var pr, ista, soffseth, soffsetw, s, left, top,
-			o = this.options, that = this;
-
-		if ( this._helper ) {
-
-			pr = this._proportionallyResizeElements;
-			ista = pr.length && ( /textarea/i ).test( pr[ 0 ].nodeName );
-			soffseth = ista && this._hasScroll( pr[ 0 ], "left" ) ? 0 : that.sizeDiff.height;
-			soffsetw = ista ? 0 : that.sizeDiff.width;
-
-			s = {
-				width: ( that.helper.width()  - soffsetw ),
-				height: ( that.helper.height() - soffseth )
-			};
-			left = ( parseFloat( that.element.css( "left" ) ) +
-				( that.position.left - that.originalPosition.left ) ) || null;
-			top = ( parseFloat( that.element.css( "top" ) ) +
-				( that.position.top - that.originalPosition.top ) ) || null;
-
-			if ( !o.animate ) {
-				this.element.css( $.extend( s, { top: top, left: left } ) );
-			}
-
-			that.helper.height( that.size.height );
-			that.helper.width( that.size.width );
-
-			if ( this._helper && !o.animate ) {
-				this._proportionallyResize();
-			}
-		}
-
-		$( "body" ).css( "cursor", "auto" );
-
-		this._removeClass( "ui-resizable-resizing" );
-
-		this._propagate( "stop", event );
-
-		if ( this._helper ) {
-			this.helper.remove();
-		}
-
-		return false;
-
-	},
-
-	_updatePrevProperties: function() {
-		this.prevPosition = {
-			top: this.position.top,
-			left: this.position.left
-		};
-		this.prevSize = {
-			width: this.size.width,
-			height: this.size.height
-		};
-	},
-
-	_applyChanges: function() {
-		var props = {};
-
-		if ( this.position.top !== this.prevPosition.top ) {
-			props.top = this.position.top + "px";
-		}
-		if ( this.position.left !== this.prevPosition.left ) {
-			props.left = this.position.left + "px";
-		}
-		if ( this.size.width !== this.prevSize.width ) {
-			props.width = this.size.width + "px";
-		}
-		if ( this.size.height !== this.prevSize.height ) {
-			props.height = this.size.height + "px";
-		}
-
-		this.helper.css( props );
-
-		return props;
-	},
-
-	_updateVirtualBoundaries: function( forceAspectRatio ) {
-		var pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b,
-			o = this.options;
-
-		b = {
-			minWidth: this._isNumber( o.minWidth ) ? o.minWidth : 0,
-			maxWidth: this._isNumber( o.maxWidth ) ? o.maxWidth : Infinity,
-			minHeight: this._isNumber( o.minHeight ) ? o.minHeight : 0,
-			maxHeight: this._isNumber( o.maxHeight ) ? o.maxHeight : Infinity
-		};
-
-		if ( this._aspectRatio || forceAspectRatio ) {
-			pMinWidth = b.minHeight * this.aspectRatio;
-			pMinHeight = b.minWidth / this.aspectRatio;
-			pMaxWidth = b.maxHeight * this.aspectRatio;
-			pMaxHeight = b.maxWidth / this.aspectRatio;
-
-			if ( pMinWidth > b.minWidth ) {
-				b.minWidth = pMinWidth;
-			}
-			if ( pMinHeight > b.minHeight ) {
-				b.minHeight = pMinHeight;
-			}
-			if ( pMaxWidth < b.maxWidth ) {
-				b.maxWidth = pMaxWidth;
-			}
-			if ( pMaxHeight < b.maxHeight ) {
-				b.maxHeight = pMaxHeight;
-			}
-		}
-		this._vBoundaries = b;
-	},
-
-	_updateCache: function( data ) {
-		this.offset = this.helper.offset();
-		if ( this._isNumber( data.left ) ) {
-			this.position.left = data.left;
-		}
-		if ( this._isNumber( data.top ) ) {
-			this.position.top = data.top;
-		}
-		if ( this._isNumber( data.height ) ) {
-			this.size.height = data.height;
-		}
-		if ( this._isNumber( data.width ) ) {
-			this.size.width = data.width;
-		}
-	},
-
-	_updateRatio: function( data ) {
-
-		var cpos = this.position,
-			csize = this.size,
-			a = this.axis;
-
-		if ( this._isNumber( data.height ) ) {
-			data.width = ( data.height * this.aspectRatio );
-		} else if ( this._isNumber( data.width ) ) {
-			data.height = ( data.width / this.aspectRatio );
-		}
-
-		if ( a === "sw" ) {
-			data.left = cpos.left + ( csize.width - data.width );
-			data.top = null;
-		}
-		if ( a === "nw" ) {
-			data.top = cpos.top + ( csize.height - data.height );
-			data.left = cpos.left + ( csize.width - data.width );
-		}
-
-		return data;
-	},
-
-	_respectSize: function( data ) {
-
-		var o = this._vBoundaries,
-			a = this.axis,
-			ismaxw = this._isNumber( data.width ) && o.maxWidth && ( o.maxWidth < data.width ),
-			ismaxh = this._isNumber( data.height ) && o.maxHeight && ( o.maxHeight < data.height ),
-			isminw = this._isNumber( data.width ) && o.minWidth && ( o.minWidth > data.width ),
-			isminh = this._isNumber( data.height ) && o.minHeight && ( o.minHeight > data.height ),
-			dw = this.originalPosition.left + this.originalSize.width,
-			dh = this.originalPosition.top + this.originalSize.height,
-			cw = /sw|nw|w/.test( a ), ch = /nw|ne|n/.test( a );
-		if ( isminw ) {
-			data.width = o.minWidth;
-		}
-		if ( isminh ) {
-			data.height = o.minHeight;
-		}
-		if ( ismaxw ) {
-			data.width = o.maxWidth;
-		}
-		if ( ismaxh ) {
-			data.height = o.maxHeight;
-		}
-
-		if ( isminw && cw ) {
-			data.left = dw - o.minWidth;
-		}
-		if ( ismaxw && cw ) {
-			data.left = dw - o.maxWidth;
-		}
-		if ( isminh && ch ) {
-			data.top = dh - o.minHeight;
-		}
-		if ( ismaxh && ch ) {
-			data.top = dh - o.maxHeight;
-		}
-
-		// Fixing jump error on top/left - bug #2330
-		if ( !data.width && !data.height && !data.left && data.top ) {
-			data.top = null;
-		} else if ( !data.width && !data.height && !data.top && data.left ) {
-			data.left = null;
-		}
-
-		return data;
-	},
-
-	_getPaddingPlusBorderDimensions: function( element ) {
-		var i = 0,
-			widths = [],
-			borders = [
-				element.css( "borderTopWidth" ),
-				element.css( "borderRightWidth" ),
-				element.css( "borderBottomWidth" ),
-				element.css( "borderLeftWidth" )
-			],
-			paddings = [
-				element.css( "paddingTop" ),
-				element.css( "paddingRight" ),
-				element.css( "paddingBottom" ),
-				element.css( "paddingLeft" )
-			];
-
-		for ( ; i < 4; i++ ) {
-			widths[ i ] = ( parseFloat( borders[ i ] ) || 0 );
-			widths[ i ] += ( parseFloat( paddings[ i ] ) || 0 );
-		}
-
-		return {
-			height: widths[ 0 ] + widths[ 2 ],
-			width: widths[ 1 ] + widths[ 3 ]
-		};
-	},
-
-	_proportionallyResize: function() {
-
-		if ( !this._proportionallyResizeElements.length ) {
-			return;
-		}
-
-		var prel,
-			i = 0,
-			element = this.helper || this.element;
-
-		for ( ; i < this._proportionallyResizeElements.length; i++ ) {
-
-			prel = this._proportionallyResizeElements[ i ];
-
-			// TODO: Seems like a bug to cache this.outerDimensions
-			// considering that we are in a loop.
-			if ( !this.outerDimensions ) {
-				this.outerDimensions = this._getPaddingPlusBorderDimensions( prel );
-			}
-
-			prel.css( {
-				height: ( element.height() - this.outerDimensions.height ) || 0,
-				width: ( element.width() - this.outerDimensions.width ) || 0
-			} );
-
-		}
-
-	},
-
-	_renderProxy: function() {
-
-		var el = this.element, o = this.options;
-		this.elementOffset = el.offset();
-
-		if ( this._helper ) {
-
-			this.helper = this.helper || $( "<div style='overflow:hidden;'></div>" );
-
-			this._addClass( this.helper, this._helper );
-			this.helper.css( {
-				width: this.element.outerWidth(),
-				height: this.element.outerHeight(),
-				position: "absolute",
-				left: this.elementOffset.left + "px",
-				top: this.elementOffset.top + "px",
-				zIndex: ++o.zIndex //TODO: Don't modify option
-			} );
-
-			this.helper
-				.appendTo( "body" )
-				.disableSelection();
-
-		} else {
-			this.helper = this.element;
-		}
-
-	},
-
-	_change: {
-		e: function( event, dx ) {
-			return { width: this.originalSize.width + dx };
-		},
-		w: function( event, dx ) {
-			var cs = this.originalSize, sp = this.originalPosition;
-			return { left: sp.left + dx, width: cs.width - dx };
-		},
-		n: function( event, dx, dy ) {
-			var cs = this.originalSize, sp = this.originalPosition;
-			return { top: sp.top + dy, height: cs.height - dy };
-		},
-		s: function( event, dx, dy ) {
-			return { height: this.originalSize.height + dy };
-		},
-		se: function( event, dx, dy ) {
-			return $.extend( this._change.s.apply( this, arguments ),
-				this._change.e.apply( this, [ event, dx, dy ] ) );
-		},
-		sw: function( event, dx, dy ) {
-			return $.extend( this._change.s.apply( this, arguments ),
-				this._change.w.apply( this, [ event, dx, dy ] ) );
-		},
-		ne: function( event, dx, dy ) {
-			return $.extend( this._change.n.apply( this, arguments ),
-				this._change.e.apply( this, [ event, dx, dy ] ) );
-		},
-		nw: function( event, dx, dy ) {
-			return $.extend( this._change.n.apply( this, arguments ),
-				this._change.w.apply( this, [ event, dx, dy ] ) );
-		}
-	},
-
-	_propagate: function( n, event ) {
-		$.ui.plugin.call( this, n, [ event, this.ui() ] );
-		( n !== "resize" && this._trigger( n, event, this.ui() ) );
-	},
-
-	plugins: {},
-
-	ui: function() {
-		return {
-			originalElement: this.originalElement,
-			element: this.element,
-			helper: this.helper,
-			position: this.position,
-			size: this.size,
-			originalSize: this.originalSize,
-			originalPosition: this.originalPosition
-		};
-	}
-
-} );
-
-/*
- * Resizable Extensions
- */
-
-$.ui.plugin.add( "resizable", "animate", {
-
-	stop: function( event ) {
-		var that = $( this ).resizable( "instance" ),
-			o = that.options,
-			pr = that._proportionallyResizeElements,
-			ista = pr.length && ( /textarea/i ).test( pr[ 0 ].nodeName ),
-			soffseth = ista && that._hasScroll( pr[ 0 ], "left" ) ? 0 : that.sizeDiff.height,
-			soffsetw = ista ? 0 : that.sizeDiff.width,
-			style = {
-				width: ( that.size.width - soffsetw ),
-				height: ( that.size.height - soffseth )
-			},
-			left = ( parseFloat( that.element.css( "left" ) ) +
-				( that.position.left - that.originalPosition.left ) ) || null,
-			top = ( parseFloat( that.element.css( "top" ) ) +
-				( that.position.top - that.originalPosition.top ) ) || null;
-
-		that.element.animate(
-			$.extend( style, top && left ? { top: top, left: left } : {} ), {
-				duration: o.animateDuration,
-				easing: o.animateEasing,
-				step: function() {
-
-					var data = {
-						width: parseFloat( that.element.css( "width" ) ),
-						height: parseFloat( that.element.css( "height" ) ),
-						top: parseFloat( that.element.css( "top" ) ),
-						left: parseFloat( that.element.css( "left" ) )
-					};
-
-					if ( pr && pr.length ) {
-						$( pr[ 0 ] ).css( { width: data.width, height: data.height } );
-					}
-
-					// Propagating resize, and updating values for each animation step
-					that._updateCache( data );
-					that._propagate( "resize", event );
-
-				}
-			}
-		);
-	}
-
-} );
-
-$.ui.plugin.add( "resizable", "containment", {
-
-	start: function() {
-		var element, p, co, ch, cw, width, height,
-			that = $( this ).resizable( "instance" ),
-			o = that.options,
-			el = that.element,
-			oc = o.containment,
-			ce = ( oc instanceof $ ) ?
-				oc.get( 0 ) :
-				( /parent/.test( oc ) ) ? el.parent().get( 0 ) : oc;
-
-		if ( !ce ) {
-			return;
-		}
-
-		that.containerElement = $( ce );
-
-		if ( /document/.test( oc ) || oc === document ) {
-			that.containerOffset = {
-				left: 0,
-				top: 0
-			};
-			that.containerPosition = {
-				left: 0,
-				top: 0
-			};
-
-			that.parentData = {
-				element: $( document ),
-				left: 0,
-				top: 0,
-				width: $( document ).width(),
-				height: $( document ).height() || document.body.parentNode.scrollHeight
-			};
-		} else {
-			element = $( ce );
-			p = [];
-			$( [ "Top", "Right", "Left", "Bottom" ] ).each( function( i, name ) {
-				p[ i ] = that._num( element.css( "padding" + name ) );
-			} );
-
-			that.containerOffset = element.offset();
-			that.containerPosition = element.position();
-			that.containerSize = {
-				height: ( element.innerHeight() - p[ 3 ] ),
-				width: ( element.innerWidth() - p[ 1 ] )
-			};
-
-			co = that.containerOffset;
-			ch = that.containerSize.height;
-			cw = that.containerSize.width;
-			width = ( that._hasScroll ( ce, "left" ) ? ce.scrollWidth : cw );
-			height = ( that._hasScroll ( ce ) ? ce.scrollHeight : ch ) ;
-
-			that.parentData = {
-				element: ce,
-				left: co.left,
-				top: co.top,
-				width: width,
-				height: height
-			};
-		}
-	},
-
-	resize: function( event ) {
-		var woset, hoset, isParent, isOffsetRelative,
-			that = $( this ).resizable( "instance" ),
-			o = that.options,
-			co = that.containerOffset,
-			cp = that.position,
-			pRatio = that._aspectRatio || event.shiftKey,
-			cop = {
-				top: 0,
-				left: 0
-			},
-			ce = that.containerElement,
-			continueResize = true;
-
-		if ( ce[ 0 ] !== document && ( /static/ ).test( ce.css( "position" ) ) ) {
-			cop = co;
-		}
-
-		if ( cp.left < ( that._helper ? co.left : 0 ) ) {
-			that.size.width = that.size.width +
-				( that._helper ?
-					( that.position.left - co.left ) :
-					( that.position.left - cop.left ) );
-
-			if ( pRatio ) {
-				that.size.height = that.size.width / that.aspectRatio;
-				continueResize = false;
-			}
-			that.position.left = o.helper ? co.left : 0;
-		}
-
-		if ( cp.top < ( that._helper ? co.top : 0 ) ) {
-			that.size.height = that.size.height +
-				( that._helper ?
-					( that.position.top - co.top ) :
-					that.position.top );
-
-			if ( pRatio ) {
-				that.size.width = that.size.height * that.aspectRatio;
-				continueResize = false;
-			}
-			that.position.top = that._helper ? co.top : 0;
-		}
-
-		isParent = that.containerElement.get( 0 ) === that.element.parent().get( 0 );
-		isOffsetRelative = /relative|absolute/.test( that.containerElement.css( "position" ) );
-
-		if ( isParent && isOffsetRelative ) {
-			that.offset.left = that.parentData.left + that.position.left;
-			that.offset.top = that.parentData.top + that.position.top;
-		} else {
-			that.offset.left = that.element.offset().left;
-			that.offset.top = that.element.offset().top;
-		}
-
-		woset = Math.abs( that.sizeDiff.width +
-			( that._helper ?
-				that.offset.left - cop.left :
-				( that.offset.left - co.left ) ) );
-
-		hoset = Math.abs( that.sizeDiff.height +
-			( that._helper ?
-				that.offset.top - cop.top :
-				( that.offset.top - co.top ) ) );
-
-		if ( woset + that.size.width >= that.parentData.width ) {
-			that.size.width = that.parentData.width - woset;
-			if ( pRatio ) {
-				that.size.height = that.size.width / that.aspectRatio;
-				continueResize = false;
-			}
-		}
-
-		if ( hoset + that.size.height >= that.parentData.height ) {
-			that.size.height = that.parentData.height - hoset;
-			if ( pRatio ) {
-				that.size.width = that.size.height * that.aspectRatio;
-				continueResize = false;
-			}
-		}
-
-		if ( !continueResize ) {
-			that.position.left = that.prevPosition.left;
-			that.position.top = that.prevPosition.top;
-			that.size.width = that.prevSize.width;
-			that.size.height = that.prevSize.height;
-		}
-	},
-
-	stop: function() {
-		var that = $( this ).resizable( "instance" ),
-			o = that.options,
-			co = that.containerOffset,
-			cop = that.containerPosition,
-			ce = that.containerElement,
-			helper = $( that.helper ),
-			ho = helper.offset(),
-			w = helper.outerWidth() - that.sizeDiff.width,
-			h = helper.outerHeight() - that.sizeDiff.height;
-
-		if ( that._helper && !o.animate && ( /relative/ ).test( ce.css( "position" ) ) ) {
-			$( this ).css( {
-				left: ho.left - cop.left - co.left,
-				width: w,
-				height: h
-			} );
-		}
-
-		if ( that._helper && !o.animate && ( /static/ ).test( ce.css( "position" ) ) ) {
-			$( this ).css( {
-				left: ho.left - cop.left - co.left,
-				width: w,
-				height: h
-			} );
-		}
-	}
-} );
-
-$.ui.plugin.add( "resizable", "alsoResize", {
-
-	start: function() {
-		var that = $( this ).resizable( "instance" ),
-			o = that.options;
-
-		$( o.alsoResize ).each( function() {
-			var el = $( this );
-			el.data( "ui-resizable-alsoresize", {
-				width: parseFloat( el.width() ), height: parseFloat( el.height() ),
-				left: parseFloat( el.css( "left" ) ), top: parseFloat( el.css( "top" ) )
-			} );
-		} );
-	},
-
-	resize: function( event, ui ) {
-		var that = $( this ).resizable( "instance" ),
-			o = that.options,
-			os = that.originalSize,
-			op = that.originalPosition,
-			delta = {
-				height: ( that.size.height - os.height ) || 0,
-				width: ( that.size.width - os.width ) || 0,
-				top: ( that.position.top - op.top ) || 0,
-				left: ( that.position.left - op.left ) || 0
-			};
-
-			$( o.alsoResize ).each( function() {
-				var el = $( this ), start = $( this ).data( "ui-resizable-alsoresize" ), style = {},
-					css = el.parents( ui.originalElement[ 0 ] ).length ?
-							[ "width", "height" ] :
-							[ "width", "height", "top", "left" ];
-
-				$.each( css, function( i, prop ) {
-					var sum = ( start[ prop ] || 0 ) + ( delta[ prop ] || 0 );
-					if ( sum && sum >= 0 ) {
-						style[ prop ] = sum || null;
-					}
-				} );
-
-				el.css( style );
-			} );
-	},
-
-	stop: function() {
-		$( this ).removeData( "ui-resizable-alsoresize" );
-	}
-} );
-
-$.ui.plugin.add( "resizable", "ghost", {
-
-	start: function() {
-
-		var that = $( this ).resizable( "instance" ), cs = that.size;
-
-		that.ghost = that.originalElement.clone();
-		that.ghost.css( {
-			opacity: 0.25,
-			display: "block",
-			position: "relative",
-			height: cs.height,
-			width: cs.width,
-			margin: 0,
-			left: 0,
-			top: 0
-		} );
-
-		that._addClass( that.ghost, "ui-resizable-ghost" );
-
-		// DEPRECATED
-		// TODO: remove after 1.12
-		if ( $.uiBackCompat !== false && typeof that.options.ghost === "string" ) {
-
-			// Ghost option
-			that.ghost.addClass( this.options.ghost );
-		}
-
-		that.ghost.appendTo( that.helper );
-
-	},
-
-	resize: function() {
-		var that = $( this ).resizable( "instance" );
-		if ( that.ghost ) {
-			that.ghost.css( {
-				position: "relative",
-				height: that.size.height,
-				width: that.size.width
-			} );
-		}
-	},
-
-	stop: function() {
-		var that = $( this ).resizable( "instance" );
-		if ( that.ghost && that.helper ) {
-			that.helper.get( 0 ).removeChild( that.ghost.get( 0 ) );
-		}
-	}
-
-} );
-
-$.ui.plugin.add( "resizable", "grid", {
-
-	resize: function() {
-		var outerDimensions,
-			that = $( this ).resizable( "instance" ),
-			o = that.options,
-			cs = that.size,
-			os = that.originalSize,
-			op = that.originalPosition,
-			a = that.axis,
-			grid = typeof o.grid === "number" ? [ o.grid, o.grid ] : o.grid,
-			gridX = ( grid[ 0 ] || 1 ),
-			gridY = ( grid[ 1 ] || 1 ),
-			ox = Math.round( ( cs.width - os.width ) / gridX ) * gridX,
-			oy = Math.round( ( cs.height - os.height ) / gridY ) * gridY,
-			newWidth = os.width + ox,
-			newHeight = os.height + oy,
-			isMaxWidth = o.maxWidth && ( o.maxWidth < newWidth ),
-			isMaxHeight = o.maxHeight && ( o.maxHeight < newHeight ),
-			isMinWidth = o.minWidth && ( o.minWidth > newWidth ),
-			isMinHeight = o.minHeight && ( o.minHeight > newHeight );
-
-		o.grid = grid;
-
-		if ( isMinWidth ) {
-			newWidth += gridX;
-		}
-		if ( isMinHeight ) {
-			newHeight += gridY;
-		}
-		if ( isMaxWidth ) {
-			newWidth -= gridX;
-		}
-		if ( isMaxHeight ) {
-			newHeight -= gridY;
-		}
-
-		if ( /^(se|s|e)$/.test( a ) ) {
-			that.size.width = newWidth;
-			that.size.height = newHeight;
-		} else if ( /^(ne)$/.test( a ) ) {
-			that.size.width = newWidth;
-			that.size.height = newHeight;
-			that.position.top = op.top - oy;
-		} else if ( /^(sw)$/.test( a ) ) {
-			that.size.width = newWidth;
-			that.size.height = newHeight;
-			that.position.left = op.left - ox;
-		} else {
-			if ( newHeight - gridY <= 0 || newWidth - gridX <= 0 ) {
-				outerDimensions = that._getPaddingPlusBorderDimensions( this );
-			}
-
-			if ( newHeight - gridY > 0 ) {
-				that.size.height = newHeight;
-				that.position.top = op.top - oy;
-			} else {
-				newHeight = gridY - outerDimensions.height;
-				that.size.height = newHeight;
-				that.position.top = op.top + os.height - newHeight;
-			}
-			if ( newWidth - gridX > 0 ) {
-				that.size.width = newWidth;
-				that.position.left = op.left - ox;
-			} else {
-				newWidth = gridX - outerDimensions.width;
-				that.size.width = newWidth;
-				that.position.left = op.left + os.width - newWidth;
-			}
-		}
-	}
-
-} );
-
-var widgetsResizable = $.ui.resizable;
-
-
-/*!
- * jQuery UI Dialog 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Dialog
-//>>group: Widgets
-//>>description: Displays customizable dialog windows.
-//>>docs: http://api.jqueryui.com/dialog/
-//>>demos: http://jqueryui.com/dialog/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/dialog.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-$.widget( "ui.dialog", {
-	version: "1.12.1",
-	options: {
-		appendTo: "body",
-		autoOpen: true,
-		buttons: [],
-		classes: {
-			"ui-dialog": "ui-corner-all",
-			"ui-dialog-titlebar": "ui-corner-all"
-		},
-		closeOnEscape: true,
-		closeText: "Close",
-		draggable: true,
-		hide: null,
-		height: "auto",
-		maxHeight: null,
-		maxWidth: null,
-		minHeight: 150,
-		minWidth: 150,
-		modal: false,
-		position: {
-			my: "center",
-			at: "center",
-			of: window,
-			collision: "fit",
-
-			// Ensure the titlebar is always visible
-			using: function( pos ) {
-				var topOffset = $( this ).css( pos ).offset().top;
-				if ( topOffset < 0 ) {
-					$( this ).css( "top", pos.top - topOffset );
-				}
-			}
-		},
-		resizable: true,
-		show: null,
-		title: null,
-		width: 300,
-
-		// Callbacks
-		beforeClose: null,
-		close: null,
-		drag: null,
-		dragStart: null,
-		dragStop: null,
-		focus: null,
-		open: null,
-		resize: null,
-		resizeStart: null,
-		resizeStop: null
-	},
-
-	sizeRelatedOptions: {
-		buttons: true,
-		height: true,
-		maxHeight: true,
-		maxWidth: true,
-		minHeight: true,
-		minWidth: true,
-		width: true
-	},
-
-	resizableRelatedOptions: {
-		maxHeight: true,
-		maxWidth: true,
-		minHeight: true,
-		minWidth: true
-	},
-
-	_create: function() {
-		this.originalCss = {
-			display: this.element[ 0 ].style.display,
-			width: this.element[ 0 ].style.width,
-			minHeight: this.element[ 0 ].style.minHeight,
-			maxHeight: this.element[ 0 ].style.maxHeight,
-			height: this.element[ 0 ].style.height
-		};
-		this.originalPosition = {
-			parent: this.element.parent(),
-			index: this.element.parent().children().index( this.element )
-		};
-		this.originalTitle = this.element.attr( "title" );
-		if ( this.options.title == null && this.originalTitle != null ) {
-			this.options.title = this.originalTitle;
-		}
-
-		// Dialogs can't be disabled
-		if ( this.options.disabled ) {
-			this.options.disabled = false;
-		}
-
-		this._createWrapper();
-
-		this.element
-			.show()
-			.removeAttr( "title" )
-			.appendTo( this.uiDialog );
-
-		this._addClass( "ui-dialog-content", "ui-widget-content" );
-
-		this._createTitlebar();
-		this._createButtonPane();
-
-		if ( this.options.draggable && $.fn.draggable ) {
-			this._makeDraggable();
-		}
-		if ( this.options.resizable && $.fn.resizable ) {
-			this._makeResizable();
-		}
-
-		this._isOpen = false;
-
-		this._trackFocus();
-	},
-
-	_init: function() {
-		if ( this.options.autoOpen ) {
-			this.open();
-		}
-	},
-
-	_appendTo: function() {
-		var element = this.options.appendTo;
-		if ( element && ( element.jquery || element.nodeType ) ) {
-			return $( element );
-		}
-		return this.document.find( element || "body" ).eq( 0 );
-	},
-
-	_destroy: function() {
-		var next,
-			originalPosition = this.originalPosition;
-
-		this._untrackInstance();
-		this._destroyOverlay();
-
-		this.element
-			.removeUniqueId()
-			.css( this.originalCss )
-
-			// Without detaching first, the following becomes really slow
-			.detach();
-
-		this.uiDialog.remove();
-
-		if ( this.originalTitle ) {
-			this.element.attr( "title", this.originalTitle );
-		}
-
-		next = originalPosition.parent.children().eq( originalPosition.index );
-
-		// Don't try to place the dialog next to itself (#8613)
-		if ( next.length && next[ 0 ] !== this.element[ 0 ] ) {
-			next.before( this.element );
-		} else {
-			originalPosition.parent.append( this.element );
-		}
-	},
-
-	widget: function() {
-		return this.uiDialog;
-	},
-
-	disable: $.noop,
-	enable: $.noop,
-
-	close: function( event ) {
-		var that = this;
-
-		if ( !this._isOpen || this._trigger( "beforeClose", event ) === false ) {
-			return;
-		}
-
-		this._isOpen = false;
-		this._focusedElement = null;
-		this._destroyOverlay();
-		this._untrackInstance();
-
-		if ( !this.opener.filter( ":focusable" ).trigger( "focus" ).length ) {
-
-			// Hiding a focused element doesn't trigger blur in WebKit
-			// so in case we have nothing to focus on, explicitly blur the active element
-			// https://bugs.webkit.org/show_bug.cgi?id=47182
-			$.ui.safeBlur( $.ui.safeActiveElement( this.document[ 0 ] ) );
-		}
-
-		this._hide( this.uiDialog, this.options.hide, function() {
-			that._trigger( "close", event );
-		} );
-	},
-
-	isOpen: function() {
-		return this._isOpen;
-	},
-
-	moveToTop: function() {
-		this._moveToTop();
-	},
-
-	_moveToTop: function( event, silent ) {
-		var moved = false,
-			zIndices = this.uiDialog.siblings( ".ui-front:visible" ).map( function() {
-				return +$( this ).css( "z-index" );
-			} ).get(),
-			zIndexMax = Math.max.apply( null, zIndices );
-
-		if ( zIndexMax >= +this.uiDialog.css( "z-index" ) ) {
-			this.uiDialog.css( "z-index", zIndexMax + 1 );
-			moved = true;
-		}
-
-		if ( moved && !silent ) {
-			this._trigger( "focus", event );
-		}
-		return moved;
-	},
-
-	open: function() {
-		var that = this;
-		if ( this._isOpen ) {
-			if ( this._moveToTop() ) {
-				this._focusTabbable();
-			}
-			return;
-		}
-
-		this._isOpen = true;
-		this.opener = $( $.ui.safeActiveElement( this.document[ 0 ] ) );
-
-		this._size();
-		this._position();
-		this._createOverlay();
-		this._moveToTop( null, true );
-
-		// Ensure the overlay is moved to the top with the dialog, but only when
-		// opening. The overlay shouldn't move after the dialog is open so that
-		// modeless dialogs opened after the modal dialog stack properly.
-		if ( this.overlay ) {
-			this.overlay.css( "z-index", this.uiDialog.css( "z-index" ) - 1 );
-		}
-
-		this._show( this.uiDialog, this.options.show, function() {
-			that._focusTabbable();
-			that._trigger( "focus" );
-		} );
-
-		// Track the dialog immediately upon openening in case a focus event
-		// somehow occurs outside of the dialog before an element inside the
-		// dialog is focused (#10152)
-		this._makeFocusTarget();
-
-		this._trigger( "open" );
-	},
-
-	_focusTabbable: function() {
-
-		// Set focus to the first match:
-		// 1. An element that was focused previously
-		// 2. First element inside the dialog matching [autofocus]
-		// 3. Tabbable element inside the content element
-		// 4. Tabbable element inside the buttonpane
-		// 5. The close button
-		// 6. The dialog itself
-		var hasFocus = this._focusedElement;
-		if ( !hasFocus ) {
-			hasFocus = this.element.find( "[autofocus]" );
-		}
-		if ( !hasFocus.length ) {
-			hasFocus = this.element.find( ":tabbable" );
-		}
-		if ( !hasFocus.length ) {
-			hasFocus = this.uiDialogButtonPane.find( ":tabbable" );
-		}
-		if ( !hasFocus.length ) {
-			hasFocus = this.uiDialogTitlebarClose.filter( ":tabbable" );
-		}
-		if ( !hasFocus.length ) {
-			hasFocus = this.uiDialog;
-		}
-		hasFocus.eq( 0 ).trigger( "focus" );
-	},
-
-	_keepFocus: function( event ) {
-		function checkFocus() {
-			var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
-				isActive = this.uiDialog[ 0 ] === activeElement ||
-					$.contains( this.uiDialog[ 0 ], activeElement );
-			if ( !isActive ) {
-				this._focusTabbable();
-			}
-		}
-		event.preventDefault();
-		checkFocus.call( this );
-
-		// support: IE
-		// IE <= 8 doesn't prevent moving focus even with event.preventDefault()
-		// so we check again later
-		this._delay( checkFocus );
-	},
-
-	_createWrapper: function() {
-		this.uiDialog = $( "<div>" )
-			.hide()
-			.attr( {
-
-				// Setting tabIndex makes the div focusable
-				tabIndex: -1,
-				role: "dialog"
-			} )
-			.appendTo( this._appendTo() );
-
-		this._addClass( this.uiDialog, "ui-dialog", "ui-widget ui-widget-content ui-front" );
-		this._on( this.uiDialog, {
-			keydown: function( event ) {
-				if ( this.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
-						event.keyCode === $.ui.keyCode.ESCAPE ) {
-					event.preventDefault();
-					this.close( event );
-					return;
-				}
-
-				// Prevent tabbing out of dialogs
-				if ( event.keyCode !== $.ui.keyCode.TAB || event.isDefaultPrevented() ) {
-					return;
-				}
-				var tabbables = this.uiDialog.find( ":tabbable" ),
-					first = tabbables.filter( ":first" ),
-					last = tabbables.filter( ":last" );
-
-				if ( ( event.target === last[ 0 ] || event.target === this.uiDialog[ 0 ] ) &&
-						!event.shiftKey ) {
-					this._delay( function() {
-						first.trigger( "focus" );
-					} );
-					event.preventDefault();
-				} else if ( ( event.target === first[ 0 ] ||
-						event.target === this.uiDialog[ 0 ] ) && event.shiftKey ) {
-					this._delay( function() {
-						last.trigger( "focus" );
-					} );
-					event.preventDefault();
-				}
-			},
-			mousedown: function( event ) {
-				if ( this._moveToTop( event ) ) {
-					this._focusTabbable();
-				}
-			}
-		} );
-
-		// We assume that any existing aria-describedby attribute means
-		// that the dialog content is marked up properly
-		// otherwise we brute force the content as the description
-		if ( !this.element.find( "[aria-describedby]" ).length ) {
-			this.uiDialog.attr( {
-				"aria-describedby": this.element.uniqueId().attr( "id" )
-			} );
-		}
-	},
-
-	_createTitlebar: function() {
-		var uiDialogTitle;
-
-		this.uiDialogTitlebar = $( "<div>" );
-		this._addClass( this.uiDialogTitlebar,
-			"ui-dialog-titlebar", "ui-widget-header ui-helper-clearfix" );
-		this._on( this.uiDialogTitlebar, {
-			mousedown: function( event ) {
-
-				// Don't prevent click on close button (#8838)
-				// Focusing a dialog that is partially scrolled out of view
-				// causes the browser to scroll it into view, preventing the click event
-				if ( !$( event.target ).closest( ".ui-dialog-titlebar-close" ) ) {
-
-					// Dialog isn't getting focus when dragging (#8063)
-					this.uiDialog.trigger( "focus" );
-				}
-			}
-		} );
-
-		// Support: IE
-		// Use type="button" to prevent enter keypresses in textboxes from closing the
-		// dialog in IE (#9312)
-		this.uiDialogTitlebarClose = $( "<button type='button'></button>" )
-			.button( {
-				label: $( "<a>" ).text( this.options.closeText ).html(),
-				icon: "ui-icon-closethick",
-				showLabel: false
-			} )
-			.appendTo( this.uiDialogTitlebar );
-
-		this._addClass( this.uiDialogTitlebarClose, "ui-dialog-titlebar-close" );
-		this._on( this.uiDialogTitlebarClose, {
-			click: function( event ) {
-				event.preventDefault();
-				this.close( event );
-			}
-		} );
-
-		uiDialogTitle = $( "<span>" ).uniqueId().prependTo( this.uiDialogTitlebar );
-		this._addClass( uiDialogTitle, "ui-dialog-title" );
-		this._title( uiDialogTitle );
-
-		this.uiDialogTitlebar.prependTo( this.uiDialog );
-
-		this.uiDialog.attr( {
-			"aria-labelledby": uiDialogTitle.attr( "id" )
-		} );
-	},
-
-	_title: function( title ) {
-		if ( this.options.title ) {
-			title.text( this.options.title );
-		} else {
-			title.html( "&#160;" );
-		}
-	},
-
-	_createButtonPane: function() {
-		this.uiDialogButtonPane = $( "<div>" );
-		this._addClass( this.uiDialogButtonPane, "ui-dialog-buttonpane",
-			"ui-widget-content ui-helper-clearfix" );
-
-		this.uiButtonSet = $( "<div>" )
-			.appendTo( this.uiDialogButtonPane );
-		this._addClass( this.uiButtonSet, "ui-dialog-buttonset" );
-
-		this._createButtons();
-	},
-
-	_createButtons: function() {
-		var that = this,
-			buttons = this.options.buttons;
-
-		// If we already have a button pane, remove it
-		this.uiDialogButtonPane.remove();
-		this.uiButtonSet.empty();
-
-		if ( $.isEmptyObject( buttons ) || ( $.isArray( buttons ) && !buttons.length ) ) {
-			this._removeClass( this.uiDialog, "ui-dialog-buttons" );
-			return;
-		}
-
-		$.each( buttons, function( name, props ) {
-			var click, buttonOptions;
-			props = $.isFunction( props ) ?
-				{ click: props, text: name } :
-				props;
-
-			// Default to a non-submitting button
-			props = $.extend( { type: "button" }, props );
-
-			// Change the context for the click callback to be the main element
-			click = props.click;
-			buttonOptions = {
-				icon: props.icon,
-				iconPosition: props.iconPosition,
-				showLabel: props.showLabel,
-
-				// Deprecated options
-				icons: props.icons,
-				text: props.text
-			};
-
-			delete props.click;
-			delete props.icon;
-			delete props.iconPosition;
-			delete props.showLabel;
-
-			// Deprecated options
-			delete props.icons;
-			if ( typeof props.text === "boolean" ) {
-				delete props.text;
-			}
-
-			$( "<button></button>", props )
-				.button( buttonOptions )
-				.appendTo( that.uiButtonSet )
-				.on( "click", function() {
-					click.apply( that.element[ 0 ], arguments );
-				} );
-		} );
-		this._addClass( this.uiDialog, "ui-dialog-buttons" );
-		this.uiDialogButtonPane.appendTo( this.uiDialog );
-	},
-
-	_makeDraggable: function() {
-		var that = this,
-			options = this.options;
-
-		function filteredUi( ui ) {
-			return {
-				position: ui.position,
-				offset: ui.offset
-			};
-		}
-
-		this.uiDialog.draggable( {
-			cancel: ".ui-dialog-content, .ui-dialog-titlebar-close",
-			handle: ".ui-dialog-titlebar",
-			containment: "document",
-			start: function( event, ui ) {
-				that._addClass( $( this ), "ui-dialog-dragging" );
-				that._blockFrames();
-				that._trigger( "dragStart", event, filteredUi( ui ) );
-			},
-			drag: function( event, ui ) {
-				that._trigger( "drag", event, filteredUi( ui ) );
-			},
-			stop: function( event, ui ) {
-				var left = ui.offset.left - that.document.scrollLeft(),
-					top = ui.offset.top - that.document.scrollTop();
-
-				options.position = {
-					my: "left top",
-					at: "left" + ( left >= 0 ? "+" : "" ) + left + " " +
-						"top" + ( top >= 0 ? "+" : "" ) + top,
-					of: that.window
-				};
-				that._removeClass( $( this ), "ui-dialog-dragging" );
-				that._unblockFrames();
-				that._trigger( "dragStop", event, filteredUi( ui ) );
-			}
-		} );
-	},
-
-	_makeResizable: function() {
-		var that = this,
-			options = this.options,
-			handles = options.resizable,
-
-			// .ui-resizable has position: relative defined in the stylesheet
-			// but dialogs have to use absolute or fixed positioning
-			position = this.uiDialog.css( "position" ),
-			resizeHandles = typeof handles === "string" ?
-				handles :
-				"n,e,s,w,se,sw,ne,nw";
-
-		function filteredUi( ui ) {
-			return {
-				originalPosition: ui.originalPosition,
-				originalSize: ui.originalSize,
-				position: ui.position,
-				size: ui.size
-			};
-		}
-
-		this.uiDialog.resizable( {
-			cancel: ".ui-dialog-content",
-			containment: "document",
-			alsoResize: this.element,
-			maxWidth: options.maxWidth,
-			maxHeight: options.maxHeight,
-			minWidth: options.minWidth,
-			minHeight: this._minHeight(),
-			handles: resizeHandles,
-			start: function( event, ui ) {
-				that._addClass( $( this ), "ui-dialog-resizing" );
-				that._blockFrames();
-				that._trigger( "resizeStart", event, filteredUi( ui ) );
-			},
-			resize: function( event, ui ) {
-				that._trigger( "resize", event, filteredUi( ui ) );
-			},
-			stop: function( event, ui ) {
-				var offset = that.uiDialog.offset(),
-					left = offset.left - that.document.scrollLeft(),
-					top = offset.top - that.document.scrollTop();
-
-				options.height = that.uiDialog.height();
-				options.width = that.uiDialog.width();
-				options.position = {
-					my: "left top",
-					at: "left" + ( left >= 0 ? "+" : "" ) + left + " " +
-						"top" + ( top >= 0 ? "+" : "" ) + top,
-					of: that.window
-				};
-				that._removeClass( $( this ), "ui-dialog-resizing" );
-				that._unblockFrames();
-				that._trigger( "resizeStop", event, filteredUi( ui ) );
-			}
-		} )
-			.css( "position", position );
-	},
-
-	_trackFocus: function() {
-		this._on( this.widget(), {
-			focusin: function( event ) {
-				this._makeFocusTarget();
-				this._focusedElement = $( event.target );
-			}
-		} );
-	},
-
-	_makeFocusTarget: function() {
-		this._untrackInstance();
-		this._trackingInstances().unshift( this );
-	},
-
-	_untrackInstance: function() {
-		var instances = this._trackingInstances(),
-			exists = $.inArray( this, instances );
-		if ( exists !== -1 ) {
-			instances.splice( exists, 1 );
-		}
-	},
-
-	_trackingInstances: function() {
-		var instances = this.document.data( "ui-dialog-instances" );
-		if ( !instances ) {
-			instances = [];
-			this.document.data( "ui-dialog-instances", instances );
-		}
-		return instances;
-	},
-
-	_minHeight: function() {
-		var options = this.options;
-
-		return options.height === "auto" ?
-			options.minHeight :
-			Math.min( options.minHeight, options.height );
-	},
-
-	_position: function() {
-
-		// Need to show the dialog to get the actual offset in the position plugin
-		var isVisible = this.uiDialog.is( ":visible" );
-		if ( !isVisible ) {
-			this.uiDialog.show();
-		}
-		this.uiDialog.position( this.options.position );
-		if ( !isVisible ) {
-			this.uiDialog.hide();
-		}
-	},
-
-	_setOptions: function( options ) {
-		var that = this,
-			resize = false,
-			resizableOptions = {};
-
-		$.each( options, function( key, value ) {
-			that._setOption( key, value );
-
-			if ( key in that.sizeRelatedOptions ) {
-				resize = true;
-			}
-			if ( key in that.resizableRelatedOptions ) {
-				resizableOptions[ key ] = value;
-			}
-		} );
-
-		if ( resize ) {
-			this._size();
-			this._position();
-		}
-		if ( this.uiDialog.is( ":data(ui-resizable)" ) ) {
-			this.uiDialog.resizable( "option", resizableOptions );
-		}
-	},
-
-	_setOption: function( key, value ) {
-		var isDraggable, isResizable,
-			uiDialog = this.uiDialog;
-
-		if ( key === "disabled" ) {
-			return;
-		}
-
-		this._super( key, value );
-
-		if ( key === "appendTo" ) {
-			this.uiDialog.appendTo( this._appendTo() );
-		}
-
-		if ( key === "buttons" ) {
-			this._createButtons();
-		}
-
-		if ( key === "closeText" ) {
-			this.uiDialogTitlebarClose.button( {
-
-				// Ensure that we always pass a string
-				label: $( "<a>" ).text( "" + this.options.closeText ).html()
-			} );
-		}
-
-		if ( key === "draggable" ) {
-			isDraggable = uiDialog.is( ":data(ui-draggable)" );
-			if ( isDraggable && !value ) {
-				uiDialog.draggable( "destroy" );
-			}
-
-			if ( !isDraggable && value ) {
-				this._makeDraggable();
-			}
-		}
-
-		if ( key === "position" ) {
-			this._position();
-		}
-
-		if ( key === "resizable" ) {
-
-			// currently resizable, becoming non-resizable
-			isResizable = uiDialog.is( ":data(ui-resizable)" );
-			if ( isResizable && !value ) {
-				uiDialog.resizable( "destroy" );
-			}
-
-			// Currently resizable, changing handles
-			if ( isResizable && typeof value === "string" ) {
-				uiDialog.resizable( "option", "handles", value );
-			}
-
-			// Currently non-resizable, becoming resizable
-			if ( !isResizable && value !== false ) {
-				this._makeResizable();
-			}
-		}
-
-		if ( key === "title" ) {
-			this._title( this.uiDialogTitlebar.find( ".ui-dialog-title" ) );
-		}
-	},
-
-	_size: function() {
-
-		// If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
-		// divs will both have width and height set, so we need to reset them
-		var nonContentHeight, minContentHeight, maxContentHeight,
-			options = this.options;
-
-		// Reset content sizing
-		this.element.show().css( {
-			width: "auto",
-			minHeight: 0,
-			maxHeight: "none",
-			height: 0
-		} );
-
-		if ( options.minWidth > options.width ) {
-			options.width = options.minWidth;
-		}
-
-		// Reset wrapper sizing
-		// determine the height of all the non-content elements
-		nonContentHeight = this.uiDialog.css( {
-			height: "auto",
-			width: options.width
-		} )
-			.outerHeight();
-		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
-		maxContentHeight = typeof options.maxHeight === "number" ?
-			Math.max( 0, options.maxHeight - nonContentHeight ) :
-			"none";
-
-		if ( options.height === "auto" ) {
-			this.element.css( {
-				minHeight: minContentHeight,
-				maxHeight: maxContentHeight,
-				height: "auto"
-			} );
-		} else {
-			this.element.height( Math.max( 0, options.height - nonContentHeight ) );
-		}
-
-		if ( this.uiDialog.is( ":data(ui-resizable)" ) ) {
-			this.uiDialog.resizable( "option", "minHeight", this._minHeight() );
-		}
-	},
-
-	_blockFrames: function() {
-		this.iframeBlocks = this.document.find( "iframe" ).map( function() {
-			var iframe = $( this );
-
-			return $( "<div>" )
-				.css( {
-					position: "absolute",
-					width: iframe.outerWidth(),
-					height: iframe.outerHeight()
-				} )
-				.appendTo( iframe.parent() )
-				.offset( iframe.offset() )[ 0 ];
-		} );
-	},
-
-	_unblockFrames: function() {
-		if ( this.iframeBlocks ) {
-			this.iframeBlocks.remove();
-			delete this.iframeBlocks;
-		}
-	},
-
-	_allowInteraction: function( event ) {
-		if ( $( event.target ).closest( ".ui-dialog" ).length ) {
-			return true;
-		}
-
-		// TODO: Remove hack when datepicker implements
-		// the .ui-front logic (#8989)
-		return !!$( event.target ).closest( ".ui-datepicker" ).length;
-	},
-
-	_createOverlay: function() {
-		if ( !this.options.modal ) {
-			return;
-		}
-
-		// We use a delay in case the overlay is created from an
-		// event that we're going to be cancelling (#2804)
-		var isOpening = true;
-		this._delay( function() {
-			isOpening = false;
-		} );
-
-		if ( !this.document.data( "ui-dialog-overlays" ) ) {
-
-			// Prevent use of anchors and inputs
-			// Using _on() for an event handler shared across many instances is
-			// safe because the dialogs stack and must be closed in reverse order
-			this._on( this.document, {
-				focusin: function( event ) {
-					if ( isOpening ) {
-						return;
-					}
-
-					if ( !this._allowInteraction( event ) ) {
-						event.preventDefault();
-						this._trackingInstances()[ 0 ]._focusTabbable();
-					}
-				}
-			} );
-		}
-
-		this.overlay = $( "<div>" )
-			.appendTo( this._appendTo() );
-
-		this._addClass( this.overlay, null, "ui-widget-overlay ui-front" );
-		this._on( this.overlay, {
-			mousedown: "_keepFocus"
-		} );
-		this.document.data( "ui-dialog-overlays",
-			( this.document.data( "ui-dialog-overlays" ) || 0 ) + 1 );
-	},
-
-	_destroyOverlay: function() {
-		if ( !this.options.modal ) {
-			return;
-		}
-
-		if ( this.overlay ) {
-			var overlays = this.document.data( "ui-dialog-overlays" ) - 1;
-
-			if ( !overlays ) {
-				this._off( this.document, "focusin" );
-				this.document.removeData( "ui-dialog-overlays" );
-			} else {
-				this.document.data( "ui-dialog-overlays", overlays );
-			}
-
-			this.overlay.remove();
-			this.overlay = null;
-		}
-	}
-} );
-
-// DEPRECATED
-// TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
-
-	// Backcompat for dialogClass option
-	$.widget( "ui.dialog", $.ui.dialog, {
-		options: {
-			dialogClass: ""
-		},
-		_createWrapper: function() {
-			this._super();
-			this.uiDialog.addClass( this.options.dialogClass );
-		},
-		_setOption: function( key, value ) {
-			if ( key === "dialogClass" ) {
-				this.uiDialog
-					.removeClass( this.options.dialogClass )
-					.addClass( value );
-			}
-			this._superApply( arguments );
-		}
-	} );
-}
-
-var widgetsDialog = $.ui.dialog;
-
-
-/*!
- * jQuery UI Droppable 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Droppable
-//>>group: Interactions
-//>>description: Enables drop targets for draggable elements.
-//>>docs: http://api.jqueryui.com/droppable/
-//>>demos: http://jqueryui.com/droppable/
-
-
-
-$.widget( "ui.droppable", {
-	version: "1.12.1",
-	widgetEventPrefix: "drop",
-	options: {
-		accept: "*",
-		addClasses: true,
-		greedy: false,
-		scope: "default",
-		tolerance: "intersect",
-
-		// Callbacks
-		activate: null,
-		deactivate: null,
-		drop: null,
-		out: null,
-		over: null
-	},
-	_create: function() {
-
-		var proportions,
-			o = this.options,
-			accept = o.accept;
-
-		this.isover = false;
-		this.isout = true;
-
-		this.accept = $.isFunction( accept ) ? accept : function( d ) {
-			return d.is( accept );
-		};
-
-		this.proportions = function( /* valueToWrite */ ) {
-			if ( arguments.length ) {
-
-				// Store the droppable's proportions
-				proportions = arguments[ 0 ];
-			} else {
-
-				// Retrieve or derive the droppable's proportions
-				return proportions ?
-					proportions :
-					proportions = {
-						width: this.element[ 0 ].offsetWidth,
-						height: this.element[ 0 ].offsetHeight
-					};
-			}
-		};
-
-		this._addToManager( o.scope );
-
-		o.addClasses && this._addClass( "ui-droppable" );
-
-	},
-
-	_addToManager: function( scope ) {
-
-		// Add the reference and positions to the manager
-		$.ui.ddmanager.droppables[ scope ] = $.ui.ddmanager.droppables[ scope ] || [];
-		$.ui.ddmanager.droppables[ scope ].push( this );
-	},
-
-	_splice: function( drop ) {
-		var i = 0;
-		for ( ; i < drop.length; i++ ) {
-			if ( drop[ i ] === this ) {
-				drop.splice( i, 1 );
-			}
-		}
-	},
-
-	_destroy: function() {
-		var drop = $.ui.ddmanager.droppables[ this.options.scope ];
-
-		this._splice( drop );
-	},
-
-	_setOption: function( key, value ) {
-
-		if ( key === "accept" ) {
-			this.accept = $.isFunction( value ) ? value : function( d ) {
-				return d.is( value );
-			};
-		} else if ( key === "scope" ) {
-			var drop = $.ui.ddmanager.droppables[ this.options.scope ];
-
-			this._splice( drop );
-			this._addToManager( value );
-		}
-
-		this._super( key, value );
-	},
-
-	_activate: function( event ) {
-		var draggable = $.ui.ddmanager.current;
-
-		this._addActiveClass();
-		if ( draggable ) {
-			this._trigger( "activate", event, this.ui( draggable ) );
-		}
-	},
-
-	_deactivate: function( event ) {
-		var draggable = $.ui.ddmanager.current;
-
-		this._removeActiveClass();
-		if ( draggable ) {
-			this._trigger( "deactivate", event, this.ui( draggable ) );
-		}
-	},
-
-	_over: function( event ) {
-
-		var draggable = $.ui.ddmanager.current;
-
-		// Bail if draggable and droppable are same element
-		if ( !draggable || ( draggable.currentItem ||
-				draggable.element )[ 0 ] === this.element[ 0 ] ) {
-			return;
-		}
-
-		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem ||
-				draggable.element ) ) ) {
-			this._addHoverClass();
-			this._trigger( "over", event, this.ui( draggable ) );
-		}
-
-	},
-
-	_out: function( event ) {
-
-		var draggable = $.ui.ddmanager.current;
-
-		// Bail if draggable and droppable are same element
-		if ( !draggable || ( draggable.currentItem ||
-				draggable.element )[ 0 ] === this.element[ 0 ] ) {
-			return;
-		}
-
-		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem ||
-				draggable.element ) ) ) {
-			this._removeHoverClass();
-			this._trigger( "out", event, this.ui( draggable ) );
-		}
-
-	},
-
-	_drop: function( event, custom ) {
-
-		var draggable = custom || $.ui.ddmanager.current,
-			childrenIntersection = false;
-
-		// Bail if draggable and droppable are same element
-		if ( !draggable || ( draggable.currentItem ||
-				draggable.element )[ 0 ] === this.element[ 0 ] ) {
-			return false;
-		}
-
-		this.element
-			.find( ":data(ui-droppable)" )
-			.not( ".ui-draggable-dragging" )
-			.each( function() {
-				var inst = $( this ).droppable( "instance" );
-				if (
-					inst.options.greedy &&
-					!inst.options.disabled &&
-					inst.options.scope === draggable.options.scope &&
-					inst.accept.call(
-						inst.element[ 0 ], ( draggable.currentItem || draggable.element )
-					) &&
-					intersect(
-						draggable,
-						$.extend( inst, { offset: inst.element.offset() } ),
-						inst.options.tolerance, event
-					)
-				) {
-					childrenIntersection = true;
-					return false; }
-			} );
-		if ( childrenIntersection ) {
-			return false;
-		}
-
-		if ( this.accept.call( this.element[ 0 ],
-				( draggable.currentItem || draggable.element ) ) ) {
-			this._removeActiveClass();
-			this._removeHoverClass();
-
-			this._trigger( "drop", event, this.ui( draggable ) );
-			return this.element;
-		}
-
-		return false;
-
-	},
-
-	ui: function( c ) {
-		return {
-			draggable: ( c.currentItem || c.element ),
-			helper: c.helper,
-			position: c.position,
-			offset: c.positionAbs
-		};
-	},
-
-	// Extension points just to make backcompat sane and avoid duplicating logic
-	// TODO: Remove in 1.13 along with call to it below
-	_addHoverClass: function() {
-		this._addClass( "ui-droppable-hover" );
-	},
-
-	_removeHoverClass: function() {
-		this._removeClass( "ui-droppable-hover" );
-	},
-
-	_addActiveClass: function() {
-		this._addClass( "ui-droppable-active" );
-	},
-
-	_removeActiveClass: function() {
-		this._removeClass( "ui-droppable-active" );
-	}
-} );
-
-var intersect = $.ui.intersect = ( function() {
-	function isOverAxis( x, reference, size ) {
-		return ( x >= reference ) && ( x < ( reference + size ) );
-	}
-
-	return function( draggable, droppable, toleranceMode, event ) {
-
-		if ( !droppable.offset ) {
-			return false;
-		}
-
-		var x1 = ( draggable.positionAbs ||
-				draggable.position.absolute ).left + draggable.margins.left,
-			y1 = ( draggable.positionAbs ||
-				draggable.position.absolute ).top + draggable.margins.top,
-			x2 = x1 + draggable.helperProportions.width,
-			y2 = y1 + draggable.helperProportions.height,
-			l = droppable.offset.left,
-			t = droppable.offset.top,
-			r = l + droppable.proportions().width,
-			b = t + droppable.proportions().height;
-
-		switch ( toleranceMode ) {
-		case "fit":
-			return ( l <= x1 && x2 <= r && t <= y1 && y2 <= b );
-		case "intersect":
-			return ( l < x1 + ( draggable.helperProportions.width / 2 ) && // Right Half
-				x2 - ( draggable.helperProportions.width / 2 ) < r && // Left Half
-				t < y1 + ( draggable.helperProportions.height / 2 ) && // Bottom Half
-				y2 - ( draggable.helperProportions.height / 2 ) < b ); // Top Half
-		case "pointer":
-			return isOverAxis( event.pageY, t, droppable.proportions().height ) &&
-				isOverAxis( event.pageX, l, droppable.proportions().width );
-		case "touch":
-			return (
-				( y1 >= t && y1 <= b ) || // Top edge touching
-				( y2 >= t && y2 <= b ) || // Bottom edge touching
-				( y1 < t && y2 > b ) // Surrounded vertically
-			) && (
-				( x1 >= l && x1 <= r ) || // Left edge touching
-				( x2 >= l && x2 <= r ) || // Right edge touching
-				( x1 < l && x2 > r ) // Surrounded horizontally
-			);
-		default:
-			return false;
-		}
-	};
-} )();
-
-/*
-	This manager tracks offsets of draggables and droppables
-*/
-$.ui.ddmanager = {
-	current: null,
-	droppables: { "default": [] },
-	prepareOffsets: function( t, event ) {
-
-		var i, j,
-			m = $.ui.ddmanager.droppables[ t.options.scope ] || [],
-			type = event ? event.type : null, // workaround for #2317
-			list = ( t.currentItem || t.element ).find( ":data(ui-droppable)" ).addBack();
-
-		droppablesLoop: for ( i = 0; i < m.length; i++ ) {
-
-			// No disabled and non-accepted
-			if ( m[ i ].options.disabled || ( t && !m[ i ].accept.call( m[ i ].element[ 0 ],
-					( t.currentItem || t.element ) ) ) ) {
-				continue;
-			}
-
-			// Filter out elements in the current dragged item
-			for ( j = 0; j < list.length; j++ ) {
-				if ( list[ j ] === m[ i ].element[ 0 ] ) {
-					m[ i ].proportions().height = 0;
-					continue droppablesLoop;
-				}
-			}
-
-			m[ i ].visible = m[ i ].element.css( "display" ) !== "none";
-			if ( !m[ i ].visible ) {
-				continue;
-			}
-
-			// Activate the droppable if used directly from draggables
-			if ( type === "mousedown" ) {
-				m[ i ]._activate.call( m[ i ], event );
-			}
-
-			m[ i ].offset = m[ i ].element.offset();
-			m[ i ].proportions( {
-				width: m[ i ].element[ 0 ].offsetWidth,
-				height: m[ i ].element[ 0 ].offsetHeight
-			} );
-
-		}
-
-	},
-	drop: function( draggable, event ) {
-
-		var dropped = false;
-
-		// Create a copy of the droppables in case the list changes during the drop (#9116)
-		$.each( ( $.ui.ddmanager.droppables[ draggable.options.scope ] || [] ).slice(), function() {
-
-			if ( !this.options ) {
-				return;
-			}
-			if ( !this.options.disabled && this.visible &&
-					intersect( draggable, this, this.options.tolerance, event ) ) {
-				dropped = this._drop.call( this, event ) || dropped;
-			}
-
-			if ( !this.options.disabled && this.visible && this.accept.call( this.element[ 0 ],
-					( draggable.currentItem || draggable.element ) ) ) {
-				this.isout = true;
-				this.isover = false;
-				this._deactivate.call( this, event );
-			}
-
-		} );
-		return dropped;
-
-	},
-	dragStart: function( draggable, event ) {
-
-		// Listen for scrolling so that if the dragging causes scrolling the position of the
-		// droppables can be recalculated (see #5003)
-		draggable.element.parentsUntil( "body" ).on( "scroll.droppable", function() {
-			if ( !draggable.options.refreshPositions ) {
-				$.ui.ddmanager.prepareOffsets( draggable, event );
-			}
-		} );
-	},
-	drag: function( draggable, event ) {
-
-		// If you have a highly dynamic page, you might try this option. It renders positions
-		// every time you move the mouse.
-		if ( draggable.options.refreshPositions ) {
-			$.ui.ddmanager.prepareOffsets( draggable, event );
-		}
-
-		// Run through all droppables and check their positions based on specific tolerance options
-		$.each( $.ui.ddmanager.droppables[ draggable.options.scope ] || [], function() {
-
-			if ( this.options.disabled || this.greedyChild || !this.visible ) {
-				return;
-			}
-
-			var parentInstance, scope, parent,
-				intersects = intersect( draggable, this, this.options.tolerance, event ),
-				c = !intersects && this.isover ?
-					"isout" :
-					( intersects && !this.isover ? "isover" : null );
-			if ( !c ) {
-				return;
-			}
-
-			if ( this.options.greedy ) {
-
-				// find droppable parents with same scope
-				scope = this.options.scope;
-				parent = this.element.parents( ":data(ui-droppable)" ).filter( function() {
-					return $( this ).droppable( "instance" ).options.scope === scope;
-				} );
-
-				if ( parent.length ) {
-					parentInstance = $( parent[ 0 ] ).droppable( "instance" );
-					parentInstance.greedyChild = ( c === "isover" );
-				}
-			}
-
-			// We just moved into a greedy child
-			if ( parentInstance && c === "isover" ) {
-				parentInstance.isover = false;
-				parentInstance.isout = true;
-				parentInstance._out.call( parentInstance, event );
-			}
-
-			this[ c ] = true;
-			this[ c === "isout" ? "isover" : "isout" ] = false;
-			this[ c === "isover" ? "_over" : "_out" ].call( this, event );
-
-			// We just moved out of a greedy child
-			if ( parentInstance && c === "isout" ) {
-				parentInstance.isout = false;
-				parentInstance.isover = true;
-				parentInstance._over.call( parentInstance, event );
-			}
-		} );
-
-	},
-	dragStop: function( draggable, event ) {
-		draggable.element.parentsUntil( "body" ).off( "scroll.droppable" );
-
-		// Call prepareOffsets one final time since IE does not fire return scroll events when
-		// overflow was caused by drag (see #5003)
-		if ( !draggable.options.refreshPositions ) {
-			$.ui.ddmanager.prepareOffsets( draggable, event );
-		}
-	}
-};
-
-// DEPRECATED
-// TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
-
-	// Backcompat for activeClass and hoverClass options
-	$.widget( "ui.droppable", $.ui.droppable, {
-		options: {
-			hoverClass: false,
-			activeClass: false
-		},
-		_addActiveClass: function() {
-			this._super();
-			if ( this.options.activeClass ) {
-				this.element.addClass( this.options.activeClass );
-			}
-		},
-		_removeActiveClass: function() {
-			this._super();
-			if ( this.options.activeClass ) {
-				this.element.removeClass( this.options.activeClass );
-			}
-		},
-		_addHoverClass: function() {
-			this._super();
-			if ( this.options.hoverClass ) {
-				this.element.addClass( this.options.hoverClass );
-			}
-		},
-		_removeHoverClass: function() {
-			this._super();
-			if ( this.options.hoverClass ) {
-				this.element.removeClass( this.options.hoverClass );
-			}
-		}
-	} );
-}
-
-var widgetsDroppable = $.ui.droppable;
-
-
-/*!
- * jQuery UI Progressbar 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Progressbar
-//>>group: Widgets
-// jscs:disable maximumLineLength
-//>>description: Displays a status indicator for loading state, standard percentage, and other progress indicators.
-// jscs:enable maximumLineLength
-//>>docs: http://api.jqueryui.com/progressbar/
-//>>demos: http://jqueryui.com/progressbar/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/progressbar.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-var widgetsProgressbar = $.widget( "ui.progressbar", {
-	version: "1.12.1",
-	options: {
-		classes: {
-			"ui-progressbar": "ui-corner-all",
-			"ui-progressbar-value": "ui-corner-left",
-			"ui-progressbar-complete": "ui-corner-right"
-		},
-		max: 100,
-		value: 0,
-
-		change: null,
-		complete: null
-	},
-
-	min: 0,
-
-	_create: function() {
-
-		// Constrain initial value
-		this.oldValue = this.options.value = this._constrainedValue();
-
-		this.element.attr( {
-
-			// Only set static values; aria-valuenow and aria-valuemax are
-			// set inside _refreshValue()
-			role: "progressbar",
-			"aria-valuemin": this.min
-		} );
-		this._addClass( "ui-progressbar", "ui-widget ui-widget-content" );
-
-		this.valueDiv = $( "<div>" ).appendTo( this.element );
-		this._addClass( this.valueDiv, "ui-progressbar-value", "ui-widget-header" );
-		this._refreshValue();
-	},
-
-	_destroy: function() {
-		this.element.removeAttr( "role aria-valuemin aria-valuemax aria-valuenow" );
-
-		this.valueDiv.remove();
-	},
-
-	value: function( newValue ) {
-		if ( newValue === undefined ) {
-			return this.options.value;
-		}
-
-		this.options.value = this._constrainedValue( newValue );
-		this._refreshValue();
-	},
-
-	_constrainedValue: function( newValue ) {
-		if ( newValue === undefined ) {
-			newValue = this.options.value;
-		}
-
-		this.indeterminate = newValue === false;
-
-		// Sanitize value
-		if ( typeof newValue !== "number" ) {
-			newValue = 0;
-		}
-
-		return this.indeterminate ? false :
-			Math.min( this.options.max, Math.max( this.min, newValue ) );
-	},
-
-	_setOptions: function( options ) {
-
-		// Ensure "value" option is set after other values (like max)
-		var value = options.value;
-		delete options.value;
-
-		this._super( options );
-
-		this.options.value = this._constrainedValue( value );
-		this._refreshValue();
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "max" ) {
-
-			// Don't allow a max less than min
-			value = Math.max( this.min, value );
-		}
-		this._super( key, value );
-	},
-
-	_setOptionDisabled: function( value ) {
-		this._super( value );
-
-		this.element.attr( "aria-disabled", value );
-		this._toggleClass( null, "ui-state-disabled", !!value );
-	},
-
-	_percentage: function() {
-		return this.indeterminate ?
-			100 :
-			100 * ( this.options.value - this.min ) / ( this.options.max - this.min );
-	},
-
-	_refreshValue: function() {
-		var value = this.options.value,
-			percentage = this._percentage();
-
-		this.valueDiv
-			.toggle( this.indeterminate || value > this.min )
-			.width( percentage.toFixed( 0 ) + "%" );
-
-		this
-			._toggleClass( this.valueDiv, "ui-progressbar-complete", null,
-				value === this.options.max )
-			._toggleClass( "ui-progressbar-indeterminate", null, this.indeterminate );
-
-		if ( this.indeterminate ) {
-			this.element.removeAttr( "aria-valuenow" );
-			if ( !this.overlayDiv ) {
-				this.overlayDiv = $( "<div>" ).appendTo( this.valueDiv );
-				this._addClass( this.overlayDiv, "ui-progressbar-overlay" );
-			}
-		} else {
-			this.element.attr( {
-				"aria-valuemax": this.options.max,
-				"aria-valuenow": value
-			} );
-			if ( this.overlayDiv ) {
-				this.overlayDiv.remove();
-				this.overlayDiv = null;
-			}
-		}
-
-		if ( this.oldValue !== value ) {
-			this.oldValue = value;
-			this._trigger( "change" );
-		}
-		if ( value === this.options.max ) {
-			this._trigger( "complete" );
-		}
-	}
-} );
-
-
-/*!
- * jQuery UI Selectable 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Selectable
-//>>group: Interactions
-//>>description: Allows groups of elements to be selected with the mouse.
-//>>docs: http://api.jqueryui.com/selectable/
-//>>demos: http://jqueryui.com/selectable/
-//>>css.structure: ../../themes/base/selectable.css
-
-
-
-var widgetsSelectable = $.widget( "ui.selectable", $.ui.mouse, {
-	version: "1.12.1",
-	options: {
-		appendTo: "body",
-		autoRefresh: true,
-		distance: 0,
-		filter: "*",
-		tolerance: "touch",
-
-		// Callbacks
-		selected: null,
-		selecting: null,
-		start: null,
-		stop: null,
-		unselected: null,
-		unselecting: null
-	},
-	_create: function() {
-		var that = this;
-
-		this._addClass( "ui-selectable" );
-
-		this.dragged = false;
-
-		// Cache selectee children based on filter
-		this.refresh = function() {
-			that.elementPos = $( that.element[ 0 ] ).offset();
-			that.selectees = $( that.options.filter, that.element[ 0 ] );
-			that._addClass( that.selectees, "ui-selectee" );
-			that.selectees.each( function() {
-				var $this = $( this ),
-					selecteeOffset = $this.offset(),
-					pos = {
-						left: selecteeOffset.left - that.elementPos.left,
-						top: selecteeOffset.top - that.elementPos.top
-					};
-				$.data( this, "selectable-item", {
-					element: this,
-					$element: $this,
-					left: pos.left,
-					top: pos.top,
-					right: pos.left + $this.outerWidth(),
-					bottom: pos.top + $this.outerHeight(),
-					startselected: false,
-					selected: $this.hasClass( "ui-selected" ),
-					selecting: $this.hasClass( "ui-selecting" ),
-					unselecting: $this.hasClass( "ui-unselecting" )
-				} );
-			} );
-		};
-		this.refresh();
-
-		this._mouseInit();
-
-		this.helper = $( "<div>" );
-		this._addClass( this.helper, "ui-selectable-helper" );
-	},
-
-	_destroy: function() {
-		this.selectees.removeData( "selectable-item" );
-		this._mouseDestroy();
-	},
-
-	_mouseStart: function( event ) {
-		var that = this,
-			options = this.options;
-
-		this.opos = [ event.pageX, event.pageY ];
-		this.elementPos = $( this.element[ 0 ] ).offset();
-
-		if ( this.options.disabled ) {
-			return;
-		}
-
-		this.selectees = $( options.filter, this.element[ 0 ] );
-
-		this._trigger( "start", event );
-
-		$( options.appendTo ).append( this.helper );
-
-		// position helper (lasso)
-		this.helper.css( {
-			"left": event.pageX,
-			"top": event.pageY,
-			"width": 0,
-			"height": 0
-		} );
-
-		if ( options.autoRefresh ) {
-			this.refresh();
-		}
-
-		this.selectees.filter( ".ui-selected" ).each( function() {
-			var selectee = $.data( this, "selectable-item" );
-			selectee.startselected = true;
-			if ( !event.metaKey && !event.ctrlKey ) {
-				that._removeClass( selectee.$element, "ui-selected" );
-				selectee.selected = false;
-				that._addClass( selectee.$element, "ui-unselecting" );
-				selectee.unselecting = true;
-
-				// selectable UNSELECTING callback
-				that._trigger( "unselecting", event, {
-					unselecting: selectee.element
-				} );
-			}
-		} );
-
-		$( event.target ).parents().addBack().each( function() {
-			var doSelect,
-				selectee = $.data( this, "selectable-item" );
-			if ( selectee ) {
-				doSelect = ( !event.metaKey && !event.ctrlKey ) ||
-					!selectee.$element.hasClass( "ui-selected" );
-				that._removeClass( selectee.$element, doSelect ? "ui-unselecting" : "ui-selected" )
-					._addClass( selectee.$element, doSelect ? "ui-selecting" : "ui-unselecting" );
-				selectee.unselecting = !doSelect;
-				selectee.selecting = doSelect;
-				selectee.selected = doSelect;
-
-				// selectable (UN)SELECTING callback
-				if ( doSelect ) {
-					that._trigger( "selecting", event, {
-						selecting: selectee.element
-					} );
-				} else {
-					that._trigger( "unselecting", event, {
-						unselecting: selectee.element
-					} );
-				}
-				return false;
-			}
-		} );
-
-	},
-
-	_mouseDrag: function( event ) {
-
-		this.dragged = true;
-
-		if ( this.options.disabled ) {
-			return;
-		}
-
-		var tmp,
-			that = this,
-			options = this.options,
-			x1 = this.opos[ 0 ],
-			y1 = this.opos[ 1 ],
-			x2 = event.pageX,
-			y2 = event.pageY;
-
-		if ( x1 > x2 ) { tmp = x2; x2 = x1; x1 = tmp; }
-		if ( y1 > y2 ) { tmp = y2; y2 = y1; y1 = tmp; }
-		this.helper.css( { left: x1, top: y1, width: x2 - x1, height: y2 - y1 } );
-
-		this.selectees.each( function() {
-			var selectee = $.data( this, "selectable-item" ),
-				hit = false,
-				offset = {};
-
-			//prevent helper from being selected if appendTo: selectable
-			if ( !selectee || selectee.element === that.element[ 0 ] ) {
-				return;
-			}
-
-			offset.left   = selectee.left   + that.elementPos.left;
-			offset.right  = selectee.right  + that.elementPos.left;
-			offset.top    = selectee.top    + that.elementPos.top;
-			offset.bottom = selectee.bottom + that.elementPos.top;
-
-			if ( options.tolerance === "touch" ) {
-				hit = ( !( offset.left > x2 || offset.right < x1 || offset.top > y2 ||
-                    offset.bottom < y1 ) );
-			} else if ( options.tolerance === "fit" ) {
-				hit = ( offset.left > x1 && offset.right < x2 && offset.top > y1 &&
-                    offset.bottom < y2 );
-			}
-
-			if ( hit ) {
-
-				// SELECT
-				if ( selectee.selected ) {
-					that._removeClass( selectee.$element, "ui-selected" );
-					selectee.selected = false;
-				}
-				if ( selectee.unselecting ) {
-					that._removeClass( selectee.$element, "ui-unselecting" );
-					selectee.unselecting = false;
-				}
-				if ( !selectee.selecting ) {
-					that._addClass( selectee.$element, "ui-selecting" );
-					selectee.selecting = true;
-
-					// selectable SELECTING callback
-					that._trigger( "selecting", event, {
-						selecting: selectee.element
-					} );
-				}
-			} else {
-
-				// UNSELECT
-				if ( selectee.selecting ) {
-					if ( ( event.metaKey || event.ctrlKey ) && selectee.startselected ) {
-						that._removeClass( selectee.$element, "ui-selecting" );
-						selectee.selecting = false;
-						that._addClass( selectee.$element, "ui-selected" );
-						selectee.selected = true;
-					} else {
-						that._removeClass( selectee.$element, "ui-selecting" );
-						selectee.selecting = false;
-						if ( selectee.startselected ) {
-							that._addClass( selectee.$element, "ui-unselecting" );
-							selectee.unselecting = true;
-						}
-
-						// selectable UNSELECTING callback
-						that._trigger( "unselecting", event, {
-							unselecting: selectee.element
-						} );
-					}
-				}
-				if ( selectee.selected ) {
-					if ( !event.metaKey && !event.ctrlKey && !selectee.startselected ) {
-						that._removeClass( selectee.$element, "ui-selected" );
-						selectee.selected = false;
-
-						that._addClass( selectee.$element, "ui-unselecting" );
-						selectee.unselecting = true;
-
-						// selectable UNSELECTING callback
-						that._trigger( "unselecting", event, {
-							unselecting: selectee.element
-						} );
-					}
-				}
-			}
-		} );
-
-		return false;
-	},
-
-	_mouseStop: function( event ) {
-		var that = this;
-
-		this.dragged = false;
-
-		$( ".ui-unselecting", this.element[ 0 ] ).each( function() {
-			var selectee = $.data( this, "selectable-item" );
-			that._removeClass( selectee.$element, "ui-unselecting" );
-			selectee.unselecting = false;
-			selectee.startselected = false;
-			that._trigger( "unselected", event, {
-				unselected: selectee.element
-			} );
-		} );
-		$( ".ui-selecting", this.element[ 0 ] ).each( function() {
-			var selectee = $.data( this, "selectable-item" );
-			that._removeClass( selectee.$element, "ui-selecting" )
-				._addClass( selectee.$element, "ui-selected" );
-			selectee.selecting = false;
-			selectee.selected = true;
-			selectee.startselected = true;
-			that._trigger( "selected", event, {
-				selected: selectee.element
-			} );
-		} );
-		this._trigger( "stop", event );
-
-		this.helper.remove();
-
-		return false;
-	}
-
-} );
-
-
-/*!
- * jQuery UI Selectmenu 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Selectmenu
-//>>group: Widgets
-// jscs:disable maximumLineLength
-//>>description: Duplicates and extends the functionality of a native HTML select element, allowing it to be customizable in behavior and appearance far beyond the limitations of a native select.
-// jscs:enable maximumLineLength
-//>>docs: http://api.jqueryui.com/selectmenu/
-//>>demos: http://jqueryui.com/selectmenu/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/selectmenu.css, ../../themes/base/button.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
-	version: "1.12.1",
-	defaultElement: "<select>",
-	options: {
-		appendTo: null,
-		classes: {
-			"ui-selectmenu-button-open": "ui-corner-top",
-			"ui-selectmenu-button-closed": "ui-corner-all"
-		},
-		disabled: null,
-		icons: {
-			button: "ui-icon-triangle-1-s"
-		},
-		position: {
-			my: "left top",
-			at: "left bottom",
-			collision: "none"
-		},
-		width: false,
-
-		// Callbacks
-		change: null,
-		close: null,
-		focus: null,
-		open: null,
-		select: null
-	},
-
-	_create: function() {
-		var selectmenuId = this.element.uniqueId().attr( "id" );
-		this.ids = {
-			element: selectmenuId,
-			button: selectmenuId + "-button",
-			menu: selectmenuId + "-menu"
-		};
-
-		this._drawButton();
-		this._drawMenu();
-		this._bindFormResetHandler();
-
-		this._rendered = false;
-		this.menuItems = $();
-	},
-
-	_drawButton: function() {
-		var icon,
-			that = this,
-			item = this._parseOption(
-				this.element.find( "option:selected" ),
-				this.element[ 0 ].selectedIndex
-			);
-
-		// Associate existing label with the new button
-		this.labels = this.element.labels().attr( "for", this.ids.button );
-		this._on( this.labels, {
-			click: function( event ) {
-				this.button.focus();
-				event.preventDefault();
-			}
-		} );
-
-		// Hide original select element
-		this.element.hide();
-
-		// Create button
-		this.button = $( "<span>", {
-			tabindex: this.options.disabled ? -1 : 0,
-			id: this.ids.button,
-			role: "combobox",
-			"aria-expanded": "false",
-			"aria-autocomplete": "list",
-			"aria-owns": this.ids.menu,
-			"aria-haspopup": "true",
-			title: this.element.attr( "title" )
-		} )
-			.insertAfter( this.element );
-
-		this._addClass( this.button, "ui-selectmenu-button ui-selectmenu-button-closed",
-			"ui-button ui-widget" );
-
-		icon = $( "<span>" ).appendTo( this.button );
-		this._addClass( icon, "ui-selectmenu-icon", "ui-icon " + this.options.icons.button );
-		this.buttonItem = this._renderButtonItem( item )
-			.appendTo( this.button );
-
-		if ( this.options.width !== false ) {
-			this._resizeButton();
-		}
-
-		this._on( this.button, this._buttonEvents );
-		this.button.one( "focusin", function() {
-
-			// Delay rendering the menu items until the button receives focus.
-			// The menu may have already been rendered via a programmatic open.
-			if ( !that._rendered ) {
-				that._refreshMenu();
-			}
-		} );
-	},
-
-	_drawMenu: function() {
-		var that = this;
-
-		// Create menu
-		this.menu = $( "<ul>", {
-			"aria-hidden": "true",
-			"aria-labelledby": this.ids.button,
-			id: this.ids.menu
-		} );
-
-		// Wrap menu
-		this.menuWrap = $( "<div>" ).append( this.menu );
-		this._addClass( this.menuWrap, "ui-selectmenu-menu", "ui-front" );
-		this.menuWrap.appendTo( this._appendTo() );
-
-		// Initialize menu widget
-		this.menuInstance = this.menu
-			.menu( {
-				classes: {
-					"ui-menu": "ui-corner-bottom"
-				},
-				role: "listbox",
-				select: function( event, ui ) {
-					event.preventDefault();
-
-					// Support: IE8
-					// If the item was selected via a click, the text selection
-					// will be destroyed in IE
-					that._setSelection();
-
-					that._select( ui.item.data( "ui-selectmenu-item" ), event );
-				},
-				focus: function( event, ui ) {
-					var item = ui.item.data( "ui-selectmenu-item" );
-
-					// Prevent inital focus from firing and check if its a newly focused item
-					if ( that.focusIndex != null && item.index !== that.focusIndex ) {
-						that._trigger( "focus", event, { item: item } );
-						if ( !that.isOpen ) {
-							that._select( item, event );
-						}
-					}
-					that.focusIndex = item.index;
-
-					that.button.attr( "aria-activedescendant",
-						that.menuItems.eq( item.index ).attr( "id" ) );
-				}
-			} )
-			.menu( "instance" );
-
-		// Don't close the menu on mouseleave
-		this.menuInstance._off( this.menu, "mouseleave" );
-
-		// Cancel the menu's collapseAll on document click
-		this.menuInstance._closeOnDocumentClick = function() {
-			return false;
-		};
-
-		// Selects often contain empty items, but never contain dividers
-		this.menuInstance._isDivider = function() {
-			return false;
-		};
-	},
-
-	refresh: function() {
-		this._refreshMenu();
-		this.buttonItem.replaceWith(
-			this.buttonItem = this._renderButtonItem(
-
-				// Fall back to an empty object in case there are no options
-				this._getSelectedItem().data( "ui-selectmenu-item" ) || {}
-			)
-		);
-		if ( this.options.width === null ) {
-			this._resizeButton();
-		}
-	},
-
-	_refreshMenu: function() {
-		var item,
-			options = this.element.find( "option" );
-
-		this.menu.empty();
-
-		this._parseOptions( options );
-		this._renderMenu( this.menu, this.items );
-
-		this.menuInstance.refresh();
-		this.menuItems = this.menu.find( "li" )
-			.not( ".ui-selectmenu-optgroup" )
-				.find( ".ui-menu-item-wrapper" );
-
-		this._rendered = true;
-
-		if ( !options.length ) {
-			return;
-		}
-
-		item = this._getSelectedItem();
-
-		// Update the menu to have the correct item focused
-		this.menuInstance.focus( null, item );
-		this._setAria( item.data( "ui-selectmenu-item" ) );
-
-		// Set disabled state
-		this._setOption( "disabled", this.element.prop( "disabled" ) );
-	},
-
-	open: function( event ) {
-		if ( this.options.disabled ) {
-			return;
-		}
-
-		// If this is the first time the menu is being opened, render the items
-		if ( !this._rendered ) {
-			this._refreshMenu();
-		} else {
-
-			// Menu clears focus on close, reset focus to selected item
-			this._removeClass( this.menu.find( ".ui-state-active" ), null, "ui-state-active" );
-			this.menuInstance.focus( null, this._getSelectedItem() );
-		}
-
-		// If there are no options, don't open the menu
-		if ( !this.menuItems.length ) {
-			return;
-		}
-
-		this.isOpen = true;
-		this._toggleAttr();
-		this._resizeMenu();
-		this._position();
-
-		this._on( this.document, this._documentClick );
-
-		this._trigger( "open", event );
-	},
-
-	_position: function() {
-		this.menuWrap.position( $.extend( { of: this.button }, this.options.position ) );
-	},
-
-	close: function( event ) {
-		if ( !this.isOpen ) {
-			return;
-		}
-
-		this.isOpen = false;
-		this._toggleAttr();
-
-		this.range = null;
-		this._off( this.document );
-
-		this._trigger( "close", event );
-	},
-
-	widget: function() {
-		return this.button;
-	},
-
-	menuWidget: function() {
-		return this.menu;
-	},
-
-	_renderButtonItem: function( item ) {
-		var buttonItem = $( "<span>" );
-
-		this._setText( buttonItem, item.label );
-		this._addClass( buttonItem, "ui-selectmenu-text" );
-
-		return buttonItem;
-	},
-
-	_renderMenu: function( ul, items ) {
-		var that = this,
-			currentOptgroup = "";
-
-		$.each( items, function( index, item ) {
-			var li;
-
-			if ( item.optgroup !== currentOptgroup ) {
-				li = $( "<li>", {
-					text: item.optgroup
-				} );
-				that._addClass( li, "ui-selectmenu-optgroup", "ui-menu-divider" +
-					( item.element.parent( "optgroup" ).prop( "disabled" ) ?
-						" ui-state-disabled" :
-						"" ) );
-
-				li.appendTo( ul );
-
-				currentOptgroup = item.optgroup;
-			}
-
-			that._renderItemData( ul, item );
-		} );
-	},
-
-	_renderItemData: function( ul, item ) {
-		return this._renderItem( ul, item ).data( "ui-selectmenu-item", item );
-	},
-
-	_renderItem: function( ul, item ) {
-		var li = $( "<li>" ),
-			wrapper = $( "<div>", {
-				title: item.element.attr( "title" )
-			} );
-
-		if ( item.disabled ) {
-			this._addClass( li, null, "ui-state-disabled" );
-		}
-		this._setText( wrapper, item.label );
-
-		return li.append( wrapper ).appendTo( ul );
-	},
-
-	_setText: function( element, value ) {
-		if ( value ) {
-			element.text( value );
-		} else {
-			element.html( "&#160;" );
-		}
-	},
-
-	_move: function( direction, event ) {
-		var item, next,
-			filter = ".ui-menu-item";
-
-		if ( this.isOpen ) {
-			item = this.menuItems.eq( this.focusIndex ).parent( "li" );
-		} else {
-			item = this.menuItems.eq( this.element[ 0 ].selectedIndex ).parent( "li" );
-			filter += ":not(.ui-state-disabled)";
-		}
-
-		if ( direction === "first" || direction === "last" ) {
-			next = item[ direction === "first" ? "prevAll" : "nextAll" ]( filter ).eq( -1 );
-		} else {
-			next = item[ direction + "All" ]( filter ).eq( 0 );
-		}
-
-		if ( next.length ) {
-			this.menuInstance.focus( event, next );
-		}
-	},
-
-	_getSelectedItem: function() {
-		return this.menuItems.eq( this.element[ 0 ].selectedIndex ).parent( "li" );
-	},
-
-	_toggle: function( event ) {
-		this[ this.isOpen ? "close" : "open" ]( event );
-	},
-
-	_setSelection: function() {
-		var selection;
-
-		if ( !this.range ) {
-			return;
-		}
-
-		if ( window.getSelection ) {
-			selection = window.getSelection();
-			selection.removeAllRanges();
-			selection.addRange( this.range );
-
-		// Support: IE8
-		} else {
-			this.range.select();
-		}
-
-		// Support: IE
-		// Setting the text selection kills the button focus in IE, but
-		// restoring the focus doesn't kill the selection.
-		this.button.focus();
-	},
-
-	_documentClick: {
-		mousedown: function( event ) {
-			if ( !this.isOpen ) {
-				return;
-			}
-
-			if ( !$( event.target ).closest( ".ui-selectmenu-menu, #" +
-					$.ui.escapeSelector( this.ids.button ) ).length ) {
-				this.close( event );
-			}
-		}
-	},
-
-	_buttonEvents: {
-
-		// Prevent text selection from being reset when interacting with the selectmenu (#10144)
-		mousedown: function() {
-			var selection;
-
-			if ( window.getSelection ) {
-				selection = window.getSelection();
-				if ( selection.rangeCount ) {
-					this.range = selection.getRangeAt( 0 );
-				}
-
-			// Support: IE8
-			} else {
-				this.range = document.selection.createRange();
-			}
-		},
-
-		click: function( event ) {
-			this._setSelection();
-			this._toggle( event );
-		},
-
-		keydown: function( event ) {
-			var preventDefault = true;
-			switch ( event.keyCode ) {
-			case $.ui.keyCode.TAB:
-			case $.ui.keyCode.ESCAPE:
-				this.close( event );
-				preventDefault = false;
-				break;
-			case $.ui.keyCode.ENTER:
-				if ( this.isOpen ) {
-					this._selectFocusedItem( event );
-				}
-				break;
-			case $.ui.keyCode.UP:
-				if ( event.altKey ) {
-					this._toggle( event );
-				} else {
-					this._move( "prev", event );
-				}
-				break;
-			case $.ui.keyCode.DOWN:
-				if ( event.altKey ) {
-					this._toggle( event );
-				} else {
-					this._move( "next", event );
-				}
-				break;
-			case $.ui.keyCode.SPACE:
-				if ( this.isOpen ) {
-					this._selectFocusedItem( event );
-				} else {
-					this._toggle( event );
-				}
-				break;
-			case $.ui.keyCode.LEFT:
-				this._move( "prev", event );
-				break;
-			case $.ui.keyCode.RIGHT:
-				this._move( "next", event );
-				break;
-			case $.ui.keyCode.HOME:
-			case $.ui.keyCode.PAGE_UP:
-				this._move( "first", event );
-				break;
-			case $.ui.keyCode.END:
-			case $.ui.keyCode.PAGE_DOWN:
-				this._move( "last", event );
-				break;
-			default:
-				this.menu.trigger( event );
-				preventDefault = false;
-			}
-
-			if ( preventDefault ) {
-				event.preventDefault();
-			}
-		}
-	},
-
-	_selectFocusedItem: function( event ) {
-		var item = this.menuItems.eq( this.focusIndex ).parent( "li" );
-		if ( !item.hasClass( "ui-state-disabled" ) ) {
-			this._select( item.data( "ui-selectmenu-item" ), event );
-		}
-	},
-
-	_select: function( item, event ) {
-		var oldIndex = this.element[ 0 ].selectedIndex;
-
-		// Change native select element
-		this.element[ 0 ].selectedIndex = item.index;
-		this.buttonItem.replaceWith( this.buttonItem = this._renderButtonItem( item ) );
-		this._setAria( item );
-		this._trigger( "select", event, { item: item } );
-
-		if ( item.index !== oldIndex ) {
-			this._trigger( "change", event, { item: item } );
-		}
-
-		this.close( event );
-	},
-
-	_setAria: function( item ) {
-		var id = this.menuItems.eq( item.index ).attr( "id" );
-
-		this.button.attr( {
-			"aria-labelledby": id,
-			"aria-activedescendant": id
-		} );
-		this.menu.attr( "aria-activedescendant", id );
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "icons" ) {
-			var icon = this.button.find( "span.ui-icon" );
-			this._removeClass( icon, null, this.options.icons.button )
-				._addClass( icon, null, value.button );
-		}
-
-		this._super( key, value );
-
-		if ( key === "appendTo" ) {
-			this.menuWrap.appendTo( this._appendTo() );
-		}
-
-		if ( key === "width" ) {
-			this._resizeButton();
-		}
-	},
-
-	_setOptionDisabled: function( value ) {
-		this._super( value );
-
-		this.menuInstance.option( "disabled", value );
-		this.button.attr( "aria-disabled", value );
-		this._toggleClass( this.button, null, "ui-state-disabled", value );
-
-		this.element.prop( "disabled", value );
-		if ( value ) {
-			this.button.attr( "tabindex", -1 );
-			this.close();
-		} else {
-			this.button.attr( "tabindex", 0 );
-		}
-	},
-
-	_appendTo: function() {
-		var element = this.options.appendTo;
-
-		if ( element ) {
-			element = element.jquery || element.nodeType ?
-				$( element ) :
-				this.document.find( element ).eq( 0 );
-		}
-
-		if ( !element || !element[ 0 ] ) {
-			element = this.element.closest( ".ui-front, dialog" );
-		}
-
-		if ( !element.length ) {
-			element = this.document[ 0 ].body;
-		}
-
-		return element;
-	},
-
-	_toggleAttr: function() {
-		this.button.attr( "aria-expanded", this.isOpen );
-
-		// We can't use two _toggleClass() calls here, because we need to make sure
-		// we always remove classes first and add them second, otherwise if both classes have the
-		// same theme class, it will be removed after we add it.
-		this._removeClass( this.button, "ui-selectmenu-button-" +
-			( this.isOpen ? "closed" : "open" ) )
-			._addClass( this.button, "ui-selectmenu-button-" +
-				( this.isOpen ? "open" : "closed" ) )
-			._toggleClass( this.menuWrap, "ui-selectmenu-open", null, this.isOpen );
-
-		this.menu.attr( "aria-hidden", !this.isOpen );
-	},
-
-	_resizeButton: function() {
-		var width = this.options.width;
-
-		// For `width: false`, just remove inline style and stop
-		if ( width === false ) {
-			this.button.css( "width", "" );
-			return;
-		}
-
-		// For `width: null`, match the width of the original element
-		if ( width === null ) {
-			width = this.element.show().outerWidth();
-			this.element.hide();
-		}
-
-		this.button.outerWidth( width );
-	},
-
-	_resizeMenu: function() {
-		this.menu.outerWidth( Math.max(
-			this.button.outerWidth(),
-
-			// Support: IE10
-			// IE10 wraps long text (possibly a rounding bug)
-			// so we add 1px to avoid the wrapping
-			this.menu.width( "" ).outerWidth() + 1
-		) );
-	},
-
-	_getCreateOptions: function() {
-		var options = this._super();
-
-		options.disabled = this.element.prop( "disabled" );
-
-		return options;
-	},
-
-	_parseOptions: function( options ) {
-		var that = this,
-			data = [];
-		options.each( function( index, item ) {
-			data.push( that._parseOption( $( item ), index ) );
-		} );
-		this.items = data;
-	},
-
-	_parseOption: function( option, index ) {
-		var optgroup = option.parent( "optgroup" );
-
-		return {
-			element: option,
-			index: index,
-			value: option.val(),
-			label: option.text(),
-			optgroup: optgroup.attr( "label" ) || "",
-			disabled: optgroup.prop( "disabled" ) || option.prop( "disabled" )
-		};
-	},
-
-	_destroy: function() {
-		this._unbindFormResetHandler();
-		this.menuWrap.remove();
-		this.button.remove();
-		this.element.show();
-		this.element.removeUniqueId();
-		this.labels.attr( "for", this.ids.element );
-	}
-} ] );
-
-
-/*!
- * jQuery UI Slider 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Slider
-//>>group: Widgets
-//>>description: Displays a flexible slider with ranges and accessibility via keyboard.
-//>>docs: http://api.jqueryui.com/slider/
-//>>demos: http://jqueryui.com/slider/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/slider.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
-	version: "1.12.1",
-	widgetEventPrefix: "slide",
-
-	options: {
-		animate: false,
-		classes: {
-			"ui-slider": "ui-corner-all",
-			"ui-slider-handle": "ui-corner-all",
-
-			// Note: ui-widget-header isn't the most fittingly semantic framework class for this
-			// element, but worked best visually with a variety of themes
-			"ui-slider-range": "ui-corner-all ui-widget-header"
-		},
-		distance: 0,
-		max: 100,
-		min: 0,
-		orientation: "horizontal",
-		range: false,
-		step: 1,
-		value: 0,
-		values: null,
-
-		// Callbacks
-		change: null,
-		slide: null,
-		start: null,
-		stop: null
-	},
-
-	// Number of pages in a slider
-	// (how many times can you page up/down to go through the whole range)
-	numPages: 5,
-
-	_create: function() {
-		this._keySliding = false;
-		this._mouseSliding = false;
-		this._animateOff = true;
-		this._handleIndex = null;
-		this._detectOrientation();
-		this._mouseInit();
-		this._calculateNewMax();
-
-		this._addClass( "ui-slider ui-slider-" + this.orientation,
-			"ui-widget ui-widget-content" );
-
-		this._refresh();
-
-		this._animateOff = false;
-	},
-
-	_refresh: function() {
-		this._createRange();
-		this._createHandles();
-		this._setupEvents();
-		this._refreshValue();
-	},
-
-	_createHandles: function() {
-		var i, handleCount,
-			options = this.options,
-			existingHandles = this.element.find( ".ui-slider-handle" ),
-			handle = "<span tabindex='0'></span>",
-			handles = [];
-
-		handleCount = ( options.values && options.values.length ) || 1;
-
-		if ( existingHandles.length > handleCount ) {
-			existingHandles.slice( handleCount ).remove();
-			existingHandles = existingHandles.slice( 0, handleCount );
-		}
-
-		for ( i = existingHandles.length; i < handleCount; i++ ) {
-			handles.push( handle );
-		}
-
-		this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( this.element ) );
-
-		this._addClass( this.handles, "ui-slider-handle", "ui-state-default" );
-
-		this.handle = this.handles.eq( 0 );
-
-		this.handles.each( function( i ) {
-			$( this )
-				.data( "ui-slider-handle-index", i )
-				.attr( "tabIndex", 0 );
-		} );
-	},
-
-	_createRange: function() {
-		var options = this.options;
-
-		if ( options.range ) {
-			if ( options.range === true ) {
-				if ( !options.values ) {
-					options.values = [ this._valueMin(), this._valueMin() ];
-				} else if ( options.values.length && options.values.length !== 2 ) {
-					options.values = [ options.values[ 0 ], options.values[ 0 ] ];
-				} else if ( $.isArray( options.values ) ) {
-					options.values = options.values.slice( 0 );
-				}
-			}
-
-			if ( !this.range || !this.range.length ) {
-				this.range = $( "<div>" )
-					.appendTo( this.element );
-
-				this._addClass( this.range, "ui-slider-range" );
-			} else {
-				this._removeClass( this.range, "ui-slider-range-min ui-slider-range-max" );
-
-				// Handle range switching from true to min/max
-				this.range.css( {
-					"left": "",
-					"bottom": ""
-				} );
-			}
-			if ( options.range === "min" || options.range === "max" ) {
-				this._addClass( this.range, "ui-slider-range-" + options.range );
-			}
-		} else {
-			if ( this.range ) {
-				this.range.remove();
-			}
-			this.range = null;
-		}
-	},
-
-	_setupEvents: function() {
-		this._off( this.handles );
-		this._on( this.handles, this._handleEvents );
-		this._hoverable( this.handles );
-		this._focusable( this.handles );
-	},
-
-	_destroy: function() {
-		this.handles.remove();
-		if ( this.range ) {
-			this.range.remove();
-		}
-
-		this._mouseDestroy();
-	},
-
-	_mouseCapture: function( event ) {
-		var position, normValue, distance, closestHandle, index, allowed, offset, mouseOverHandle,
-			that = this,
-			o = this.options;
-
-		if ( o.disabled ) {
-			return false;
-		}
-
-		this.elementSize = {
-			width: this.element.outerWidth(),
-			height: this.element.outerHeight()
-		};
-		this.elementOffset = this.element.offset();
-
-		position = { x: event.pageX, y: event.pageY };
-		normValue = this._normValueFromMouse( position );
-		distance = this._valueMax() - this._valueMin() + 1;
-		this.handles.each( function( i ) {
-			var thisDistance = Math.abs( normValue - that.values( i ) );
-			if ( ( distance > thisDistance ) ||
-				( distance === thisDistance &&
-					( i === that._lastChangedValue || that.values( i ) === o.min ) ) ) {
-				distance = thisDistance;
-				closestHandle = $( this );
-				index = i;
-			}
-		} );
-
-		allowed = this._start( event, index );
-		if ( allowed === false ) {
-			return false;
-		}
-		this._mouseSliding = true;
-
-		this._handleIndex = index;
-
-		this._addClass( closestHandle, null, "ui-state-active" );
-		closestHandle.trigger( "focus" );
-
-		offset = closestHandle.offset();
-		mouseOverHandle = !$( event.target ).parents().addBack().is( ".ui-slider-handle" );
-		this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
-			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
-			top: event.pageY - offset.top -
-				( closestHandle.height() / 2 ) -
-				( parseInt( closestHandle.css( "borderTopWidth" ), 10 ) || 0 ) -
-				( parseInt( closestHandle.css( "borderBottomWidth" ), 10 ) || 0 ) +
-				( parseInt( closestHandle.css( "marginTop" ), 10 ) || 0 )
-		};
-
-		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
-			this._slide( event, index, normValue );
-		}
-		this._animateOff = true;
-		return true;
-	},
-
-	_mouseStart: function() {
-		return true;
-	},
-
-	_mouseDrag: function( event ) {
-		var position = { x: event.pageX, y: event.pageY },
-			normValue = this._normValueFromMouse( position );
-
-		this._slide( event, this._handleIndex, normValue );
-
-		return false;
-	},
-
-	_mouseStop: function( event ) {
-		this._removeClass( this.handles, null, "ui-state-active" );
-		this._mouseSliding = false;
-
-		this._stop( event, this._handleIndex );
-		this._change( event, this._handleIndex );
-
-		this._handleIndex = null;
-		this._clickOffset = null;
-		this._animateOff = false;
-
-		return false;
-	},
-
-	_detectOrientation: function() {
-		this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
-	},
-
-	_normValueFromMouse: function( position ) {
-		var pixelTotal,
-			pixelMouse,
-			percentMouse,
-			valueTotal,
-			valueMouse;
-
-		if ( this.orientation === "horizontal" ) {
-			pixelTotal = this.elementSize.width;
-			pixelMouse = position.x - this.elementOffset.left -
-				( this._clickOffset ? this._clickOffset.left : 0 );
-		} else {
-			pixelTotal = this.elementSize.height;
-			pixelMouse = position.y - this.elementOffset.top -
-				( this._clickOffset ? this._clickOffset.top : 0 );
-		}
-
-		percentMouse = ( pixelMouse / pixelTotal );
-		if ( percentMouse > 1 ) {
-			percentMouse = 1;
-		}
-		if ( percentMouse < 0 ) {
-			percentMouse = 0;
-		}
-		if ( this.orientation === "vertical" ) {
-			percentMouse = 1 - percentMouse;
-		}
-
-		valueTotal = this._valueMax() - this._valueMin();
-		valueMouse = this._valueMin() + percentMouse * valueTotal;
-
-		return this._trimAlignValue( valueMouse );
-	},
-
-	_uiHash: function( index, value, values ) {
-		var uiHash = {
-			handle: this.handles[ index ],
-			handleIndex: index,
-			value: value !== undefined ? value : this.value()
-		};
-
-		if ( this._hasMultipleValues() ) {
-			uiHash.value = value !== undefined ? value : this.values( index );
-			uiHash.values = values || this.values();
-		}
-
-		return uiHash;
-	},
-
-	_hasMultipleValues: function() {
-		return this.options.values && this.options.values.length;
-	},
-
-	_start: function( event, index ) {
-		return this._trigger( "start", event, this._uiHash( index ) );
-	},
-
-	_slide: function( event, index, newVal ) {
-		var allowed, otherVal,
-			currentValue = this.value(),
-			newValues = this.values();
-
-		if ( this._hasMultipleValues() ) {
-			otherVal = this.values( index ? 0 : 1 );
-			currentValue = this.values( index );
-
-			if ( this.options.values.length === 2 && this.options.range === true ) {
-				newVal =  index === 0 ? Math.min( otherVal, newVal ) : Math.max( otherVal, newVal );
-			}
-
-			newValues[ index ] = newVal;
-		}
-
-		if ( newVal === currentValue ) {
-			return;
-		}
-
-		allowed = this._trigger( "slide", event, this._uiHash( index, newVal, newValues ) );
-
-		// A slide can be canceled by returning false from the slide callback
-		if ( allowed === false ) {
-			return;
-		}
-
-		if ( this._hasMultipleValues() ) {
-			this.values( index, newVal );
-		} else {
-			this.value( newVal );
-		}
-	},
-
-	_stop: function( event, index ) {
-		this._trigger( "stop", event, this._uiHash( index ) );
-	},
-
-	_change: function( event, index ) {
-		if ( !this._keySliding && !this._mouseSliding ) {
-
-			//store the last changed value index for reference when handles overlap
-			this._lastChangedValue = index;
-			this._trigger( "change", event, this._uiHash( index ) );
-		}
-	},
-
-	value: function( newValue ) {
-		if ( arguments.length ) {
-			this.options.value = this._trimAlignValue( newValue );
-			this._refreshValue();
-			this._change( null, 0 );
-			return;
-		}
-
-		return this._value();
-	},
-
-	values: function( index, newValue ) {
-		var vals,
-			newValues,
-			i;
-
-		if ( arguments.length > 1 ) {
-			this.options.values[ index ] = this._trimAlignValue( newValue );
-			this._refreshValue();
-			this._change( null, index );
-			return;
-		}
-
-		if ( arguments.length ) {
-			if ( $.isArray( arguments[ 0 ] ) ) {
-				vals = this.options.values;
-				newValues = arguments[ 0 ];
-				for ( i = 0; i < vals.length; i += 1 ) {
-					vals[ i ] = this._trimAlignValue( newValues[ i ] );
-					this._change( null, i );
-				}
-				this._refreshValue();
-			} else {
-				if ( this._hasMultipleValues() ) {
-					return this._values( index );
-				} else {
-					return this.value();
-				}
-			}
-		} else {
-			return this._values();
-		}
-	},
-
-	_setOption: function( key, value ) {
-		var i,
-			valsLength = 0;
-
-		if ( key === "range" && this.options.range === true ) {
-			if ( value === "min" ) {
-				this.options.value = this._values( 0 );
-				this.options.values = null;
-			} else if ( value === "max" ) {
-				this.options.value = this._values( this.options.values.length - 1 );
-				this.options.values = null;
-			}
-		}
-
-		if ( $.isArray( this.options.values ) ) {
-			valsLength = this.options.values.length;
-		}
-
-		this._super( key, value );
-
-		switch ( key ) {
-			case "orientation":
-				this._detectOrientation();
-				this._removeClass( "ui-slider-horizontal ui-slider-vertical" )
-					._addClass( "ui-slider-" + this.orientation );
-				this._refreshValue();
-				if ( this.options.range ) {
-					this._refreshRange( value );
-				}
-
-				// Reset positioning from previous orientation
-				this.handles.css( value === "horizontal" ? "bottom" : "left", "" );
-				break;
-			case "value":
-				this._animateOff = true;
-				this._refreshValue();
-				this._change( null, 0 );
-				this._animateOff = false;
-				break;
-			case "values":
-				this._animateOff = true;
-				this._refreshValue();
-
-				// Start from the last handle to prevent unreachable handles (#9046)
-				for ( i = valsLength - 1; i >= 0; i-- ) {
-					this._change( null, i );
-				}
-				this._animateOff = false;
-				break;
-			case "step":
-			case "min":
-			case "max":
-				this._animateOff = true;
-				this._calculateNewMax();
-				this._refreshValue();
-				this._animateOff = false;
-				break;
-			case "range":
-				this._animateOff = true;
-				this._refresh();
-				this._animateOff = false;
-				break;
-		}
-	},
-
-	_setOptionDisabled: function( value ) {
-		this._super( value );
-
-		this._toggleClass( null, "ui-state-disabled", !!value );
-	},
-
-	//internal value getter
-	// _value() returns value trimmed by min and max, aligned by step
-	_value: function() {
-		var val = this.options.value;
-		val = this._trimAlignValue( val );
-
-		return val;
-	},
-
-	//internal values getter
-	// _values() returns array of values trimmed by min and max, aligned by step
-	// _values( index ) returns single value trimmed by min and max, aligned by step
-	_values: function( index ) {
-		var val,
-			vals,
-			i;
-
-		if ( arguments.length ) {
-			val = this.options.values[ index ];
-			val = this._trimAlignValue( val );
-
-			return val;
-		} else if ( this._hasMultipleValues() ) {
-
-			// .slice() creates a copy of the array
-			// this copy gets trimmed by min and max and then returned
-			vals = this.options.values.slice();
-			for ( i = 0; i < vals.length; i += 1 ) {
-				vals[ i ] = this._trimAlignValue( vals[ i ] );
-			}
-
-			return vals;
-		} else {
-			return [];
-		}
-	},
-
-	// Returns the step-aligned value that val is closest to, between (inclusive) min and max
-	_trimAlignValue: function( val ) {
-		if ( val <= this._valueMin() ) {
-			return this._valueMin();
-		}
-		if ( val >= this._valueMax() ) {
-			return this._valueMax();
-		}
-		var step = ( this.options.step > 0 ) ? this.options.step : 1,
-			valModStep = ( val - this._valueMin() ) % step,
-			alignValue = val - valModStep;
-
-		if ( Math.abs( valModStep ) * 2 >= step ) {
-			alignValue += ( valModStep > 0 ) ? step : ( -step );
-		}
-
-		// Since JavaScript has problems with large floats, round
-		// the final value to 5 digits after the decimal point (see #4124)
-		return parseFloat( alignValue.toFixed( 5 ) );
-	},
-
-	_calculateNewMax: function() {
-		var max = this.options.max,
-			min = this._valueMin(),
-			step = this.options.step,
-			aboveMin = Math.round( ( max - min ) / step ) * step;
-		max = aboveMin + min;
-		if ( max > this.options.max ) {
-
-			//If max is not divisible by step, rounding off may increase its value
-			max -= step;
-		}
-		this.max = parseFloat( max.toFixed( this._precision() ) );
-	},
-
-	_precision: function() {
-		var precision = this._precisionOf( this.options.step );
-		if ( this.options.min !== null ) {
-			precision = Math.max( precision, this._precisionOf( this.options.min ) );
-		}
-		return precision;
-	},
-
-	_precisionOf: function( num ) {
-		var str = num.toString(),
-			decimal = str.indexOf( "." );
-		return decimal === -1 ? 0 : str.length - decimal - 1;
-	},
-
-	_valueMin: function() {
-		return this.options.min;
-	},
-
-	_valueMax: function() {
-		return this.max;
-	},
-
-	_refreshRange: function( orientation ) {
-		if ( orientation === "vertical" ) {
-			this.range.css( { "width": "", "left": "" } );
-		}
-		if ( orientation === "horizontal" ) {
-			this.range.css( { "height": "", "bottom": "" } );
-		}
-	},
-
-	_refreshValue: function() {
-		var lastValPercent, valPercent, value, valueMin, valueMax,
-			oRange = this.options.range,
-			o = this.options,
-			that = this,
-			animate = ( !this._animateOff ) ? o.animate : false,
-			_set = {};
-
-		if ( this._hasMultipleValues() ) {
-			this.handles.each( function( i ) {
-				valPercent = ( that.values( i ) - that._valueMin() ) / ( that._valueMax() -
-					that._valueMin() ) * 100;
-				_set[ that.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
-				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
-				if ( that.options.range === true ) {
-					if ( that.orientation === "horizontal" ) {
-						if ( i === 0 ) {
-							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( {
-								left: valPercent + "%"
-							}, o.animate );
-						}
-						if ( i === 1 ) {
-							that.range[ animate ? "animate" : "css" ]( {
-								width: ( valPercent - lastValPercent ) + "%"
-							}, {
-								queue: false,
-								duration: o.animate
-							} );
-						}
-					} else {
-						if ( i === 0 ) {
-							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( {
-								bottom: ( valPercent ) + "%"
-							}, o.animate );
-						}
-						if ( i === 1 ) {
-							that.range[ animate ? "animate" : "css" ]( {
-								height: ( valPercent - lastValPercent ) + "%"
-							}, {
-								queue: false,
-								duration: o.animate
-							} );
-						}
-					}
-				}
-				lastValPercent = valPercent;
-			} );
-		} else {
-			value = this.value();
-			valueMin = this._valueMin();
-			valueMax = this._valueMax();
-			valPercent = ( valueMax !== valueMin ) ?
-					( value - valueMin ) / ( valueMax - valueMin ) * 100 :
-					0;
-			_set[ this.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
-			this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
-
-			if ( oRange === "min" && this.orientation === "horizontal" ) {
-				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( {
-					width: valPercent + "%"
-				}, o.animate );
-			}
-			if ( oRange === "max" && this.orientation === "horizontal" ) {
-				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( {
-					width: ( 100 - valPercent ) + "%"
-				}, o.animate );
-			}
-			if ( oRange === "min" && this.orientation === "vertical" ) {
-				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( {
-					height: valPercent + "%"
-				}, o.animate );
-			}
-			if ( oRange === "max" && this.orientation === "vertical" ) {
-				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( {
-					height: ( 100 - valPercent ) + "%"
-				}, o.animate );
-			}
-		}
-	},
-
-	_handleEvents: {
-		keydown: function( event ) {
-			var allowed, curVal, newVal, step,
-				index = $( event.target ).data( "ui-slider-handle-index" );
-
-			switch ( event.keyCode ) {
-				case $.ui.keyCode.HOME:
-				case $.ui.keyCode.END:
-				case $.ui.keyCode.PAGE_UP:
-				case $.ui.keyCode.PAGE_DOWN:
-				case $.ui.keyCode.UP:
-				case $.ui.keyCode.RIGHT:
-				case $.ui.keyCode.DOWN:
-				case $.ui.keyCode.LEFT:
-					event.preventDefault();
-					if ( !this._keySliding ) {
-						this._keySliding = true;
-						this._addClass( $( event.target ), null, "ui-state-active" );
-						allowed = this._start( event, index );
-						if ( allowed === false ) {
-							return;
-						}
-					}
-					break;
-			}
-
-			step = this.options.step;
-			if ( this._hasMultipleValues() ) {
-				curVal = newVal = this.values( index );
-			} else {
-				curVal = newVal = this.value();
-			}
-
-			switch ( event.keyCode ) {
-				case $.ui.keyCode.HOME:
-					newVal = this._valueMin();
-					break;
-				case $.ui.keyCode.END:
-					newVal = this._valueMax();
-					break;
-				case $.ui.keyCode.PAGE_UP:
-					newVal = this._trimAlignValue(
-						curVal + ( ( this._valueMax() - this._valueMin() ) / this.numPages )
-					);
-					break;
-				case $.ui.keyCode.PAGE_DOWN:
-					newVal = this._trimAlignValue(
-						curVal - ( ( this._valueMax() - this._valueMin() ) / this.numPages ) );
-					break;
-				case $.ui.keyCode.UP:
-				case $.ui.keyCode.RIGHT:
-					if ( curVal === this._valueMax() ) {
-						return;
-					}
-					newVal = this._trimAlignValue( curVal + step );
-					break;
-				case $.ui.keyCode.DOWN:
-				case $.ui.keyCode.LEFT:
-					if ( curVal === this._valueMin() ) {
-						return;
-					}
-					newVal = this._trimAlignValue( curVal - step );
-					break;
-			}
-
-			this._slide( event, index, newVal );
-		},
-		keyup: function( event ) {
-			var index = $( event.target ).data( "ui-slider-handle-index" );
-
-			if ( this._keySliding ) {
-				this._keySliding = false;
-				this._stop( event, index );
-				this._change( event, index );
-				this._removeClass( $( event.target ), null, "ui-state-active" );
-			}
-		}
-	}
-} );
-
-
-/*!
- * jQuery UI Sortable 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Sortable
-//>>group: Interactions
-//>>description: Enables items in a list to be sorted using the mouse.
-//>>docs: http://api.jqueryui.com/sortable/
-//>>demos: http://jqueryui.com/sortable/
-//>>css.structure: ../../themes/base/sortable.css
-
-
-
-var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
-	version: "1.12.1",
-	widgetEventPrefix: "sort",
-	ready: false,
-	options: {
-		appendTo: "parent",
-		axis: false,
-		connectWith: false,
-		containment: false,
-		cursor: "auto",
-		cursorAt: false,
-		dropOnEmpty: true,
-		forcePlaceholderSize: false,
-		forceHelperSize: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		items: "> *",
-		opacity: false,
-		placeholder: false,
-		revert: false,
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		scope: "default",
-		tolerance: "intersect",
-		zIndex: 1000,
-
-		// Callbacks
-		activate: null,
-		beforeStop: null,
-		change: null,
-		deactivate: null,
-		out: null,
-		over: null,
-		receive: null,
-		remove: null,
-		sort: null,
-		start: null,
-		stop: null,
-		update: null
-	},
-
-	_isOverAxis: function( x, reference, size ) {
-		return ( x >= reference ) && ( x < ( reference + size ) );
-	},
-
-	_isFloating: function( item ) {
-		return ( /left|right/ ).test( item.css( "float" ) ) ||
-			( /inline|table-cell/ ).test( item.css( "display" ) );
-	},
-
-	_create: function() {
-		this.containerCache = {};
-		this._addClass( "ui-sortable" );
-
-		//Get the items
-		this.refresh();
-
-		//Let's determine the parent's offset
-		this.offset = this.element.offset();
-
-		//Initialize mouse events for interaction
-		this._mouseInit();
-
-		this._setHandleClassName();
-
-		//We're ready to go
-		this.ready = true;
-
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-
-		if ( key === "handle" ) {
-			this._setHandleClassName();
-		}
-	},
-
-	_setHandleClassName: function() {
-		var that = this;
-		this._removeClass( this.element.find( ".ui-sortable-handle" ), "ui-sortable-handle" );
-		$.each( this.items, function() {
-			that._addClass(
-				this.instance.options.handle ?
-					this.item.find( this.instance.options.handle ) :
-					this.item,
-				"ui-sortable-handle"
-			);
-		} );
-	},
-
-	_destroy: function() {
-		this._mouseDestroy();
-
-		for ( var i = this.items.length - 1; i >= 0; i-- ) {
-			this.items[ i ].item.removeData( this.widgetName + "-item" );
-		}
-
-		return this;
-	},
-
-	_mouseCapture: function( event, overrideHandle ) {
-		var currentItem = null,
-			validHandle = false,
-			that = this;
-
-		if ( this.reverting ) {
-			return false;
-		}
-
-		if ( this.options.disabled || this.options.type === "static" ) {
-			return false;
-		}
-
-		//We have to refresh the items data once first
-		this._refreshItems( event );
-
-		//Find out if the clicked node (or one of its parents) is a actual item in this.items
-		$( event.target ).parents().each( function() {
-			if ( $.data( this, that.widgetName + "-item" ) === that ) {
-				currentItem = $( this );
-				return false;
-			}
-		} );
-		if ( $.data( event.target, that.widgetName + "-item" ) === that ) {
-			currentItem = $( event.target );
-		}
-
-		if ( !currentItem ) {
-			return false;
-		}
-		if ( this.options.handle && !overrideHandle ) {
-			$( this.options.handle, currentItem ).find( "*" ).addBack().each( function() {
-				if ( this === event.target ) {
-					validHandle = true;
-				}
-			} );
-			if ( !validHandle ) {
-				return false;
-			}
-		}
-
-		this.currentItem = currentItem;
-		this._removeCurrentsFromItems();
-		return true;
-
-	},
-
-	_mouseStart: function( event, overrideHandle, noActivation ) {
-
-		var i, body,
-			o = this.options;
-
-		this.currentContainer = this;
-
-		//We only need to call refreshPositions, because the refreshItems call has been moved to
-		// mouseCapture
-		this.refreshPositions();
-
-		//Create and append the visible helper
-		this.helper = this._createHelper( event );
-
-		//Cache the helper size
-		this._cacheHelperProportions();
-
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-
-		//Cache the margins of the original element
-		this._cacheMargins();
-
-		//Get the next scrolling parent
-		this.scrollParent = this.helper.scrollParent();
-
-		//The element's absolute position on the page minus margins
-		this.offset = this.currentItem.offset();
-		this.offset = {
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-
-		$.extend( this.offset, {
-			click: { //Where the click happened, relative to the element
-				left: event.pageX - this.offset.left,
-				top: event.pageY - this.offset.top
-			},
-			parent: this._getParentOffset(),
-
-			// This is a relative to absolute position minus the actual position calculation -
-			// only used for relative positioned helper
-			relative: this._getRelativeOffset()
-		} );
-
-		// Only after we got the offset, we can change the helper's position to absolute
-		// TODO: Still need to figure out a way to make relative sorting possible
-		this.helper.css( "position", "absolute" );
-		this.cssPosition = this.helper.css( "position" );
-
-		//Generate the original position
-		this.originalPosition = this._generatePosition( event );
-		this.originalPageX = event.pageX;
-		this.originalPageY = event.pageY;
-
-		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
-		( o.cursorAt && this._adjustOffsetFromHelper( o.cursorAt ) );
-
-		//Cache the former DOM position
-		this.domPosition = {
-			prev: this.currentItem.prev()[ 0 ],
-			parent: this.currentItem.parent()[ 0 ]
-		};
-
-		// If the helper is not the original, hide the original so it's not playing any role during
-		// the drag, won't cause anything bad this way
-		if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
-			this.currentItem.hide();
-		}
-
-		//Create the placeholder
-		this._createPlaceholder();
-
-		//Set a containment if given in the options
-		if ( o.containment ) {
-			this._setContainment();
-		}
-
-		if ( o.cursor && o.cursor !== "auto" ) { // cursor option
-			body = this.document.find( "body" );
-
-			// Support: IE
-			this.storedCursor = body.css( "cursor" );
-			body.css( "cursor", o.cursor );
-
-			this.storedStylesheet =
-				$( "<style>*{ cursor: " + o.cursor + " !important; }</style>" ).appendTo( body );
-		}
-
-		if ( o.opacity ) { // opacity option
-			if ( this.helper.css( "opacity" ) ) {
-				this._storedOpacity = this.helper.css( "opacity" );
-			}
-			this.helper.css( "opacity", o.opacity );
-		}
-
-		if ( o.zIndex ) { // zIndex option
-			if ( this.helper.css( "zIndex" ) ) {
-				this._storedZIndex = this.helper.css( "zIndex" );
-			}
-			this.helper.css( "zIndex", o.zIndex );
-		}
-
-		//Prepare scrolling
-		if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
-				this.scrollParent[ 0 ].tagName !== "HTML" ) {
-			this.overflowOffset = this.scrollParent.offset();
-		}
-
-		//Call callbacks
-		this._trigger( "start", event, this._uiHash() );
-
-		//Recache the helper size
-		if ( !this._preserveHelperProportions ) {
-			this._cacheHelperProportions();
-		}
-
-		//Post "activate" events to possible containers
-		if ( !noActivation ) {
-			for ( i = this.containers.length - 1; i >= 0; i-- ) {
-				this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
-			}
-		}
-
-		//Prepare possible droppables
-		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.current = this;
-		}
-
-		if ( $.ui.ddmanager && !o.dropBehaviour ) {
-			$.ui.ddmanager.prepareOffsets( this, event );
-		}
-
-		this.dragging = true;
-
-		this._addClass( this.helper, "ui-sortable-helper" );
-
-		// Execute the drag once - this causes the helper not to be visiblebefore getting its
-		// correct position
-		this._mouseDrag( event );
-		return true;
-
-	},
-
-	_mouseDrag: function( event ) {
-		var i, item, itemElement, intersection,
-			o = this.options,
-			scrolled = false;
-
-		//Compute the helpers position
-		this.position = this._generatePosition( event );
-		this.positionAbs = this._convertPositionTo( "absolute" );
-
-		if ( !this.lastPositionAbs ) {
-			this.lastPositionAbs = this.positionAbs;
-		}
-
-		//Do scrolling
-		if ( this.options.scroll ) {
-			if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
-					this.scrollParent[ 0 ].tagName !== "HTML" ) {
-
-				if ( ( this.overflowOffset.top + this.scrollParent[ 0 ].offsetHeight ) -
-						event.pageY < o.scrollSensitivity ) {
-					this.scrollParent[ 0 ].scrollTop =
-						scrolled = this.scrollParent[ 0 ].scrollTop + o.scrollSpeed;
-				} else if ( event.pageY - this.overflowOffset.top < o.scrollSensitivity ) {
-					this.scrollParent[ 0 ].scrollTop =
-						scrolled = this.scrollParent[ 0 ].scrollTop - o.scrollSpeed;
-				}
-
-				if ( ( this.overflowOffset.left + this.scrollParent[ 0 ].offsetWidth ) -
-						event.pageX < o.scrollSensitivity ) {
-					this.scrollParent[ 0 ].scrollLeft = scrolled =
-						this.scrollParent[ 0 ].scrollLeft + o.scrollSpeed;
-				} else if ( event.pageX - this.overflowOffset.left < o.scrollSensitivity ) {
-					this.scrollParent[ 0 ].scrollLeft = scrolled =
-						this.scrollParent[ 0 ].scrollLeft - o.scrollSpeed;
-				}
-
-			} else {
-
-				if ( event.pageY - this.document.scrollTop() < o.scrollSensitivity ) {
-					scrolled = this.document.scrollTop( this.document.scrollTop() - o.scrollSpeed );
-				} else if ( this.window.height() - ( event.pageY - this.document.scrollTop() ) <
-						o.scrollSensitivity ) {
-					scrolled = this.document.scrollTop( this.document.scrollTop() + o.scrollSpeed );
-				}
-
-				if ( event.pageX - this.document.scrollLeft() < o.scrollSensitivity ) {
-					scrolled = this.document.scrollLeft(
-						this.document.scrollLeft() - o.scrollSpeed
-					);
-				} else if ( this.window.width() - ( event.pageX - this.document.scrollLeft() ) <
-						o.scrollSensitivity ) {
-					scrolled = this.document.scrollLeft(
-						this.document.scrollLeft() + o.scrollSpeed
-					);
-				}
-
-			}
-
-			if ( scrolled !== false && $.ui.ddmanager && !o.dropBehaviour ) {
-				$.ui.ddmanager.prepareOffsets( this, event );
-			}
-		}
-
-		//Regenerate the absolute position used for position checks
-		this.positionAbs = this._convertPositionTo( "absolute" );
-
-		//Set the helper position
-		if ( !this.options.axis || this.options.axis !== "y" ) {
-			this.helper[ 0 ].style.left = this.position.left + "px";
-		}
-		if ( !this.options.axis || this.options.axis !== "x" ) {
-			this.helper[ 0 ].style.top = this.position.top + "px";
-		}
-
-		//Rearrange
-		for ( i = this.items.length - 1; i >= 0; i-- ) {
-
-			//Cache variables and intersection, continue if no intersection
-			item = this.items[ i ];
-			itemElement = item.item[ 0 ];
-			intersection = this._intersectsWithPointer( item );
-			if ( !intersection ) {
-				continue;
-			}
-
-			// Only put the placeholder inside the current Container, skip all
-			// items from other containers. This works because when moving
-			// an item from one container to another the
-			// currentContainer is switched before the placeholder is moved.
-			//
-			// Without this, moving items in "sub-sortables" can cause
-			// the placeholder to jitter between the outer and inner container.
-			if ( item.instance !== this.currentContainer ) {
-				continue;
-			}
-
-			// Cannot intersect with itself
-			// no useless actions that have been done before
-			// no action if the item moved is the parent of the item checked
-			if ( itemElement !== this.currentItem[ 0 ] &&
-				this.placeholder[ intersection === 1 ? "next" : "prev" ]()[ 0 ] !== itemElement &&
-				!$.contains( this.placeholder[ 0 ], itemElement ) &&
-				( this.options.type === "semi-dynamic" ?
-					!$.contains( this.element[ 0 ], itemElement ) :
-					true
-				)
-			) {
-
-				this.direction = intersection === 1 ? "down" : "up";
-
-				if ( this.options.tolerance === "pointer" || this._intersectsWithSides( item ) ) {
-					this._rearrange( event, item );
-				} else {
-					break;
-				}
-
-				this._trigger( "change", event, this._uiHash() );
-				break;
-			}
-		}
-
-		//Post events to containers
-		this._contactContainers( event );
-
-		//Interconnect with droppables
-		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.drag( this, event );
-		}
-
-		//Call callbacks
-		this._trigger( "sort", event, this._uiHash() );
-
-		this.lastPositionAbs = this.positionAbs;
-		return false;
-
-	},
-
-	_mouseStop: function( event, noPropagation ) {
-
-		if ( !event ) {
-			return;
-		}
-
-		//If we are using droppables, inform the manager about the drop
-		if ( $.ui.ddmanager && !this.options.dropBehaviour ) {
-			$.ui.ddmanager.drop( this, event );
-		}
-
-		if ( this.options.revert ) {
-			var that = this,
-				cur = this.placeholder.offset(),
-				axis = this.options.axis,
-				animation = {};
-
-			if ( !axis || axis === "x" ) {
-				animation.left = cur.left - this.offset.parent.left - this.margins.left +
-					( this.offsetParent[ 0 ] === this.document[ 0 ].body ?
-						0 :
-						this.offsetParent[ 0 ].scrollLeft
-					);
-			}
-			if ( !axis || axis === "y" ) {
-				animation.top = cur.top - this.offset.parent.top - this.margins.top +
-					( this.offsetParent[ 0 ] === this.document[ 0 ].body ?
-						0 :
-						this.offsetParent[ 0 ].scrollTop
-					);
-			}
-			this.reverting = true;
-			$( this.helper ).animate(
-				animation,
-				parseInt( this.options.revert, 10 ) || 500,
-				function() {
-					that._clear( event );
-				}
-			);
-		} else {
-			this._clear( event, noPropagation );
-		}
-
-		return false;
-
-	},
-
-	cancel: function() {
-
-		if ( this.dragging ) {
-
-			this._mouseUp( new $.Event( "mouseup", { target: null } ) );
-
-			if ( this.options.helper === "original" ) {
-				this.currentItem.css( this._storedCSS );
-				this._removeClass( this.currentItem, "ui-sortable-helper" );
-			} else {
-				this.currentItem.show();
-			}
-
-			//Post deactivating events to containers
-			for ( var i = this.containers.length - 1; i >= 0; i-- ) {
-				this.containers[ i ]._trigger( "deactivate", null, this._uiHash( this ) );
-				if ( this.containers[ i ].containerCache.over ) {
-					this.containers[ i ]._trigger( "out", null, this._uiHash( this ) );
-					this.containers[ i ].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		if ( this.placeholder ) {
-
-			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately,
-			// it unbinds ALL events from the original node!
-			if ( this.placeholder[ 0 ].parentNode ) {
-				this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] );
-			}
-			if ( this.options.helper !== "original" && this.helper &&
-					this.helper[ 0 ].parentNode ) {
-				this.helper.remove();
-			}
-
-			$.extend( this, {
-				helper: null,
-				dragging: false,
-				reverting: false,
-				_noFinalSort: null
-			} );
-
-			if ( this.domPosition.prev ) {
-				$( this.domPosition.prev ).after( this.currentItem );
-			} else {
-				$( this.domPosition.parent ).prepend( this.currentItem );
-			}
-		}
-
-		return this;
-
-	},
-
-	serialize: function( o ) {
-
-		var items = this._getItemsAsjQuery( o && o.connected ),
-			str = [];
-		o = o || {};
-
-		$( items ).each( function() {
-			var res = ( $( o.item || this ).attr( o.attribute || "id" ) || "" )
-				.match( o.expression || ( /(.+)[\-=_](.+)/ ) );
-			if ( res ) {
-				str.push(
-					( o.key || res[ 1 ] + "[]" ) +
-					"=" + ( o.key && o.expression ? res[ 1 ] : res[ 2 ] ) );
-			}
-		} );
-
-		if ( !str.length && o.key ) {
-			str.push( o.key + "=" );
-		}
-
-		return str.join( "&" );
-
-	},
-
-	toArray: function( o ) {
-
-		var items = this._getItemsAsjQuery( o && o.connected ),
-			ret = [];
-
-		o = o || {};
-
-		items.each( function() {
-			ret.push( $( o.item || this ).attr( o.attribute || "id" ) || "" );
-		} );
-		return ret;
-
-	},
-
-	/* Be careful with the following core functions */
-	_intersectsWith: function( item ) {
-
-		var x1 = this.positionAbs.left,
-			x2 = x1 + this.helperProportions.width,
-			y1 = this.positionAbs.top,
-			y2 = y1 + this.helperProportions.height,
-			l = item.left,
-			r = l + item.width,
-			t = item.top,
-			b = t + item.height,
-			dyClick = this.offset.click.top,
-			dxClick = this.offset.click.left,
-			isOverElementHeight = ( this.options.axis === "x" ) || ( ( y1 + dyClick ) > t &&
-				( y1 + dyClick ) < b ),
-			isOverElementWidth = ( this.options.axis === "y" ) || ( ( x1 + dxClick ) > l &&
-				( x1 + dxClick ) < r ),
-			isOverElement = isOverElementHeight && isOverElementWidth;
-
-		if ( this.options.tolerance === "pointer" ||
-			this.options.forcePointerForContainers ||
-			( this.options.tolerance !== "pointer" &&
-				this.helperProportions[ this.floating ? "width" : "height" ] >
-				item[ this.floating ? "width" : "height" ] )
-		) {
-			return isOverElement;
-		} else {
-
-			return ( l < x1 + ( this.helperProportions.width / 2 ) && // Right Half
-				x2 - ( this.helperProportions.width / 2 ) < r && // Left Half
-				t < y1 + ( this.helperProportions.height / 2 ) && // Bottom Half
-				y2 - ( this.helperProportions.height / 2 ) < b ); // Top Half
-
-		}
-	},
-
-	_intersectsWithPointer: function( item ) {
-		var verticalDirection, horizontalDirection,
-			isOverElementHeight = ( this.options.axis === "x" ) ||
-				this._isOverAxis(
-					this.positionAbs.top + this.offset.click.top, item.top, item.height ),
-			isOverElementWidth = ( this.options.axis === "y" ) ||
-				this._isOverAxis(
-					this.positionAbs.left + this.offset.click.left, item.left, item.width ),
-			isOverElement = isOverElementHeight && isOverElementWidth;
-
-		if ( !isOverElement ) {
-			return false;
-		}
-
-		verticalDirection = this._getDragVerticalDirection();
-		horizontalDirection = this._getDragHorizontalDirection();
-
-		return this.floating ?
-			( ( horizontalDirection === "right" || verticalDirection === "down" ) ? 2 : 1 )
-			: ( verticalDirection && ( verticalDirection === "down" ? 2 : 1 ) );
-
-	},
-
-	_intersectsWithSides: function( item ) {
-
-		var isOverBottomHalf = this._isOverAxis( this.positionAbs.top +
-				this.offset.click.top, item.top + ( item.height / 2 ), item.height ),
-			isOverRightHalf = this._isOverAxis( this.positionAbs.left +
-				this.offset.click.left, item.left + ( item.width / 2 ), item.width ),
-			verticalDirection = this._getDragVerticalDirection(),
-			horizontalDirection = this._getDragHorizontalDirection();
-
-		if ( this.floating && horizontalDirection ) {
-			return ( ( horizontalDirection === "right" && isOverRightHalf ) ||
-				( horizontalDirection === "left" && !isOverRightHalf ) );
-		} else {
-			return verticalDirection && ( ( verticalDirection === "down" && isOverBottomHalf ) ||
-				( verticalDirection === "up" && !isOverBottomHalf ) );
-		}
-
-	},
-
-	_getDragVerticalDirection: function() {
-		var delta = this.positionAbs.top - this.lastPositionAbs.top;
-		return delta !== 0 && ( delta > 0 ? "down" : "up" );
-	},
-
-	_getDragHorizontalDirection: function() {
-		var delta = this.positionAbs.left - this.lastPositionAbs.left;
-		return delta !== 0 && ( delta > 0 ? "right" : "left" );
-	},
-
-	refresh: function( event ) {
-		this._refreshItems( event );
-		this._setHandleClassName();
-		this.refreshPositions();
-		return this;
-	},
-
-	_connectWith: function() {
-		var options = this.options;
-		return options.connectWith.constructor === String ?
-			[ options.connectWith ] :
-			options.connectWith;
-	},
-
-	_getItemsAsjQuery: function( connected ) {
-
-		var i, j, cur, inst,
-			items = [],
-			queries = [],
-			connectWith = this._connectWith();
-
-		if ( connectWith && connected ) {
-			for ( i = connectWith.length - 1; i >= 0; i-- ) {
-				cur = $( connectWith[ i ], this.document[ 0 ] );
-				for ( j = cur.length - 1; j >= 0; j-- ) {
-					inst = $.data( cur[ j ], this.widgetFullName );
-					if ( inst && inst !== this && !inst.options.disabled ) {
-						queries.push( [ $.isFunction( inst.options.items ) ?
-							inst.options.items.call( inst.element ) :
-							$( inst.options.items, inst.element )
-								.not( ".ui-sortable-helper" )
-								.not( ".ui-sortable-placeholder" ), inst ] );
-					}
-				}
-			}
-		}
-
-		queries.push( [ $.isFunction( this.options.items ) ?
-			this.options.items
-				.call( this.element, null, { options: this.options, item: this.currentItem } ) :
-			$( this.options.items, this.element )
-				.not( ".ui-sortable-helper" )
-				.not( ".ui-sortable-placeholder" ), this ] );
-
-		function addItems() {
-			items.push( this );
-		}
-		for ( i = queries.length - 1; i >= 0; i-- ) {
-			queries[ i ][ 0 ].each( addItems );
-		}
-
-		return $( items );
-
-	},
-
-	_removeCurrentsFromItems: function() {
-
-		var list = this.currentItem.find( ":data(" + this.widgetName + "-item)" );
-
-		this.items = $.grep( this.items, function( item ) {
-			for ( var j = 0; j < list.length; j++ ) {
-				if ( list[ j ] === item.item[ 0 ] ) {
-					return false;
-				}
-			}
-			return true;
-		} );
-
-	},
-
-	_refreshItems: function( event ) {
-
-		this.items = [];
-		this.containers = [ this ];
-
-		var i, j, cur, inst, targetData, _queries, item, queriesLength,
-			items = this.items,
-			queries = [ [ $.isFunction( this.options.items ) ?
-				this.options.items.call( this.element[ 0 ], event, { item: this.currentItem } ) :
-				$( this.options.items, this.element ), this ] ],
-			connectWith = this._connectWith();
-
-		//Shouldn't be run the first time through due to massive slow-down
-		if ( connectWith && this.ready ) {
-			for ( i = connectWith.length - 1; i >= 0; i-- ) {
-				cur = $( connectWith[ i ], this.document[ 0 ] );
-				for ( j = cur.length - 1; j >= 0; j-- ) {
-					inst = $.data( cur[ j ], this.widgetFullName );
-					if ( inst && inst !== this && !inst.options.disabled ) {
-						queries.push( [ $.isFunction( inst.options.items ) ?
-							inst.options.items
-								.call( inst.element[ 0 ], event, { item: this.currentItem } ) :
-							$( inst.options.items, inst.element ), inst ] );
-						this.containers.push( inst );
-					}
-				}
-			}
-		}
-
-		for ( i = queries.length - 1; i >= 0; i-- ) {
-			targetData = queries[ i ][ 1 ];
-			_queries = queries[ i ][ 0 ];
-
-			for ( j = 0, queriesLength = _queries.length; j < queriesLength; j++ ) {
-				item = $( _queries[ j ] );
-
-				// Data for target checking (mouse manager)
-				item.data( this.widgetName + "-item", targetData );
-
-				items.push( {
-					item: item,
-					instance: targetData,
-					width: 0, height: 0,
-					left: 0, top: 0
-				} );
-			}
-		}
-
-	},
-
-	refreshPositions: function( fast ) {
-
-		// Determine whether items are being displayed horizontally
-		this.floating = this.items.length ?
-			this.options.axis === "x" || this._isFloating( this.items[ 0 ].item ) :
-			false;
-
-		//This has to be redone because due to the item being moved out/into the offsetParent,
-		// the offsetParent's position will change
-		if ( this.offsetParent && this.helper ) {
-			this.offset.parent = this._getParentOffset();
-		}
-
-		var i, item, t, p;
-
-		for ( i = this.items.length - 1; i >= 0; i-- ) {
-			item = this.items[ i ];
-
-			//We ignore calculating positions of all connected containers when we're not over them
-			if ( item.instance !== this.currentContainer && this.currentContainer &&
-					item.item[ 0 ] !== this.currentItem[ 0 ] ) {
-				continue;
-			}
-
-			t = this.options.toleranceElement ?
-				$( this.options.toleranceElement, item.item ) :
-				item.item;
-
-			if ( !fast ) {
-				item.width = t.outerWidth();
-				item.height = t.outerHeight();
-			}
-
-			p = t.offset();
-			item.left = p.left;
-			item.top = p.top;
-		}
-
-		if ( this.options.custom && this.options.custom.refreshContainers ) {
-			this.options.custom.refreshContainers.call( this );
-		} else {
-			for ( i = this.containers.length - 1; i >= 0; i-- ) {
-				p = this.containers[ i ].element.offset();
-				this.containers[ i ].containerCache.left = p.left;
-				this.containers[ i ].containerCache.top = p.top;
-				this.containers[ i ].containerCache.width =
-					this.containers[ i ].element.outerWidth();
-				this.containers[ i ].containerCache.height =
-					this.containers[ i ].element.outerHeight();
-			}
-		}
-
-		return this;
-	},
-
-	_createPlaceholder: function( that ) {
-		that = that || this;
-		var className,
-			o = that.options;
-
-		if ( !o.placeholder || o.placeholder.constructor === String ) {
-			className = o.placeholder;
-			o.placeholder = {
-				element: function() {
-
-					var nodeName = that.currentItem[ 0 ].nodeName.toLowerCase(),
-						element = $( "<" + nodeName + ">", that.document[ 0 ] );
-
-						that._addClass( element, "ui-sortable-placeholder",
-								className || that.currentItem[ 0 ].className )
-							._removeClass( element, "ui-sortable-helper" );
-
-					if ( nodeName === "tbody" ) {
-						that._createTrPlaceholder(
-							that.currentItem.find( "tr" ).eq( 0 ),
-							$( "<tr>", that.document[ 0 ] ).appendTo( element )
-						);
-					} else if ( nodeName === "tr" ) {
-						that._createTrPlaceholder( that.currentItem, element );
-					} else if ( nodeName === "img" ) {
-						element.attr( "src", that.currentItem.attr( "src" ) );
-					}
-
-					if ( !className ) {
-						element.css( "visibility", "hidden" );
-					}
-
-					return element;
-				},
-				update: function( container, p ) {
-
-					// 1. If a className is set as 'placeholder option, we don't force sizes -
-					// the class is responsible for that
-					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a
-					// class name is specified
-					if ( className && !o.forcePlaceholderSize ) {
-						return;
-					}
-
-					//If the element doesn't have a actual height by itself (without styles coming
-					// from a stylesheet), it receives the inline height from the dragged item
-					if ( !p.height() ) {
-						p.height(
-							that.currentItem.innerHeight() -
-							parseInt( that.currentItem.css( "paddingTop" ) || 0, 10 ) -
-							parseInt( that.currentItem.css( "paddingBottom" ) || 0, 10 ) );
-					}
-					if ( !p.width() ) {
-						p.width(
-							that.currentItem.innerWidth() -
-							parseInt( that.currentItem.css( "paddingLeft" ) || 0, 10 ) -
-							parseInt( that.currentItem.css( "paddingRight" ) || 0, 10 ) );
-					}
-				}
-			};
-		}
-
-		//Create the placeholder
-		that.placeholder = $( o.placeholder.element.call( that.element, that.currentItem ) );
-
-		//Append it after the actual current item
-		that.currentItem.after( that.placeholder );
-
-		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
-		o.placeholder.update( that, that.placeholder );
-
-	},
-
-	_createTrPlaceholder: function( sourceTr, targetTr ) {
-		var that = this;
-
-		sourceTr.children().each( function() {
-			$( "<td>&#160;</td>", that.document[ 0 ] )
-				.attr( "colspan", $( this ).attr( "colspan" ) || 1 )
-				.appendTo( targetTr );
-		} );
-	},
-
-	_contactContainers: function( event ) {
-		var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, cur, nearBottom,
-			floating, axis,
-			innermostContainer = null,
-			innermostIndex = null;
-
-		// Get innermost container that intersects with item
-		for ( i = this.containers.length - 1; i >= 0; i-- ) {
-
-			// Never consider a container that's located within the item itself
-			if ( $.contains( this.currentItem[ 0 ], this.containers[ i ].element[ 0 ] ) ) {
-				continue;
-			}
-
-			if ( this._intersectsWith( this.containers[ i ].containerCache ) ) {
-
-				// If we've already found a container and it's more "inner" than this, then continue
-				if ( innermostContainer &&
-						$.contains(
-							this.containers[ i ].element[ 0 ],
-							innermostContainer.element[ 0 ] ) ) {
-					continue;
-				}
-
-				innermostContainer = this.containers[ i ];
-				innermostIndex = i;
-
-			} else {
-
-				// container doesn't intersect. trigger "out" event if necessary
-				if ( this.containers[ i ].containerCache.over ) {
-					this.containers[ i ]._trigger( "out", event, this._uiHash( this ) );
-					this.containers[ i ].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		// If no intersecting containers found, return
-		if ( !innermostContainer ) {
-			return;
-		}
-
-		// Move the item into the container if it's not there already
-		if ( this.containers.length === 1 ) {
-			if ( !this.containers[ innermostIndex ].containerCache.over ) {
-				this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
-				this.containers[ innermostIndex ].containerCache.over = 1;
-			}
-		} else {
-
-			// When entering a new container, we will find the item with the least distance and
-			// append our item near it
-			dist = 10000;
-			itemWithLeastDistance = null;
-			floating = innermostContainer.floating || this._isFloating( this.currentItem );
-			posProperty = floating ? "left" : "top";
-			sizeProperty = floating ? "width" : "height";
-			axis = floating ? "pageX" : "pageY";
-
-			for ( j = this.items.length - 1; j >= 0; j-- ) {
-				if ( !$.contains(
-						this.containers[ innermostIndex ].element[ 0 ], this.items[ j ].item[ 0 ] )
-				) {
-					continue;
-				}
-				if ( this.items[ j ].item[ 0 ] === this.currentItem[ 0 ] ) {
-					continue;
-				}
-
-				cur = this.items[ j ].item.offset()[ posProperty ];
-				nearBottom = false;
-				if ( event[ axis ] - cur > this.items[ j ][ sizeProperty ] / 2 ) {
-					nearBottom = true;
-				}
-
-				if ( Math.abs( event[ axis ] - cur ) < dist ) {
-					dist = Math.abs( event[ axis ] - cur );
-					itemWithLeastDistance = this.items[ j ];
-					this.direction = nearBottom ? "up" : "down";
-				}
-			}
-
-			//Check if dropOnEmpty is enabled
-			if ( !itemWithLeastDistance && !this.options.dropOnEmpty ) {
-				return;
-			}
-
-			if ( this.currentContainer === this.containers[ innermostIndex ] ) {
-				if ( !this.currentContainer.containerCache.over ) {
-					this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash() );
-					this.currentContainer.containerCache.over = 1;
-				}
-				return;
-			}
-
-			itemWithLeastDistance ?
-				this._rearrange( event, itemWithLeastDistance, null, true ) :
-				this._rearrange( event, null, this.containers[ innermostIndex ].element, true );
-			this._trigger( "change", event, this._uiHash() );
-			this.containers[ innermostIndex ]._trigger( "change", event, this._uiHash( this ) );
-			this.currentContainer = this.containers[ innermostIndex ];
-
-			//Update the placeholder
-			this.options.placeholder.update( this.currentContainer, this.placeholder );
-
-			this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
-			this.containers[ innermostIndex ].containerCache.over = 1;
-		}
-
-	},
-
-	_createHelper: function( event ) {
-
-		var o = this.options,
-			helper = $.isFunction( o.helper ) ?
-				$( o.helper.apply( this.element[ 0 ], [ event, this.currentItem ] ) ) :
-				( o.helper === "clone" ? this.currentItem.clone() : this.currentItem );
-
-		//Add the helper to the DOM if that didn't happen already
-		if ( !helper.parents( "body" ).length ) {
-			$( o.appendTo !== "parent" ?
-				o.appendTo :
-				this.currentItem[ 0 ].parentNode )[ 0 ].appendChild( helper[ 0 ] );
-		}
-
-		if ( helper[ 0 ] === this.currentItem[ 0 ] ) {
-			this._storedCSS = {
-				width: this.currentItem[ 0 ].style.width,
-				height: this.currentItem[ 0 ].style.height,
-				position: this.currentItem.css( "position" ),
-				top: this.currentItem.css( "top" ),
-				left: this.currentItem.css( "left" )
-			};
-		}
-
-		if ( !helper[ 0 ].style.width || o.forceHelperSize ) {
-			helper.width( this.currentItem.width() );
-		}
-		if ( !helper[ 0 ].style.height || o.forceHelperSize ) {
-			helper.height( this.currentItem.height() );
-		}
-
-		return helper;
-
-	},
-
-	_adjustOffsetFromHelper: function( obj ) {
-		if ( typeof obj === "string" ) {
-			obj = obj.split( " " );
-		}
-		if ( $.isArray( obj ) ) {
-			obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 };
-		}
-		if ( "left" in obj ) {
-			this.offset.click.left = obj.left + this.margins.left;
-		}
-		if ( "right" in obj ) {
-			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
-		}
-		if ( "top" in obj ) {
-			this.offset.click.top = obj.top + this.margins.top;
-		}
-		if ( "bottom" in obj ) {
-			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
-		}
-	},
-
-	_getParentOffset: function() {
-
-		//Get the offsetParent and cache its position
-		this.offsetParent = this.helper.offsetParent();
-		var po = this.offsetParent.offset();
-
-		// This is a special case where we need to modify a offset calculated on start, since the
-		// following happened:
-		// 1. The position of the helper is absolute, so it's position is calculated based on the
-		// next positioned parent
-		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't
-		// the document, which means that the scroll is included in the initial calculation of the
-		// offset of the parent, and never recalculated upon drag
-		if ( this.cssPosition === "absolute" && this.scrollParent[ 0 ] !== this.document[ 0 ] &&
-				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) {
-			po.left += this.scrollParent.scrollLeft();
-			po.top += this.scrollParent.scrollTop();
-		}
-
-		// This needs to be actually done for all browsers, since pageX/pageY includes this
-		// information with an ugly IE fix
-		if ( this.offsetParent[ 0 ] === this.document[ 0 ].body ||
-				( this.offsetParent[ 0 ].tagName &&
-				this.offsetParent[ 0 ].tagName.toLowerCase() === "html" && $.ui.ie ) ) {
-			po = { top: 0, left: 0 };
-		}
-
-		return {
-			top: po.top + ( parseInt( this.offsetParent.css( "borderTopWidth" ), 10 ) || 0 ),
-			left: po.left + ( parseInt( this.offsetParent.css( "borderLeftWidth" ), 10 ) || 0 )
-		};
-
-	},
-
-	_getRelativeOffset: function() {
-
-		if ( this.cssPosition === "relative" ) {
-			var p = this.currentItem.position();
-			return {
-				top: p.top - ( parseInt( this.helper.css( "top" ), 10 ) || 0 ) +
-					this.scrollParent.scrollTop(),
-				left: p.left - ( parseInt( this.helper.css( "left" ), 10 ) || 0 ) +
-					this.scrollParent.scrollLeft()
-			};
-		} else {
-			return { top: 0, left: 0 };
-		}
-
-	},
-
-	_cacheMargins: function() {
-		this.margins = {
-			left: ( parseInt( this.currentItem.css( "marginLeft" ), 10 ) || 0 ),
-			top: ( parseInt( this.currentItem.css( "marginTop" ), 10 ) || 0 )
-		};
-	},
-
-	_cacheHelperProportions: function() {
-		this.helperProportions = {
-			width: this.helper.outerWidth(),
-			height: this.helper.outerHeight()
-		};
-	},
-
-	_setContainment: function() {
-
-		var ce, co, over,
-			o = this.options;
-		if ( o.containment === "parent" ) {
-			o.containment = this.helper[ 0 ].parentNode;
-		}
-		if ( o.containment === "document" || o.containment === "window" ) {
-			this.containment = [
-				0 - this.offset.relative.left - this.offset.parent.left,
-				0 - this.offset.relative.top - this.offset.parent.top,
-				o.containment === "document" ?
-					this.document.width() :
-					this.window.width() - this.helperProportions.width - this.margins.left,
-				( o.containment === "document" ?
-					( this.document.height() || document.body.parentNode.scrollHeight ) :
-					this.window.height() || this.document[ 0 ].body.parentNode.scrollHeight
-				) - this.helperProportions.height - this.margins.top
-			];
-		}
-
-		if ( !( /^(document|window|parent)$/ ).test( o.containment ) ) {
-			ce = $( o.containment )[ 0 ];
-			co = $( o.containment ).offset();
-			over = ( $( ce ).css( "overflow" ) !== "hidden" );
-
-			this.containment = [
-				co.left + ( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) +
-					( parseInt( $( ce ).css( "paddingLeft" ), 10 ) || 0 ) - this.margins.left,
-				co.top + ( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) +
-					( parseInt( $( ce ).css( "paddingTop" ), 10 ) || 0 ) - this.margins.top,
-				co.left + ( over ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) -
-					( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) -
-					( parseInt( $( ce ).css( "paddingRight" ), 10 ) || 0 ) -
-					this.helperProportions.width - this.margins.left,
-				co.top + ( over ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) -
-					( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) -
-					( parseInt( $( ce ).css( "paddingBottom" ), 10 ) || 0 ) -
-					this.helperProportions.height - this.margins.top
-			];
-		}
-
-	},
-
-	_convertPositionTo: function( d, pos ) {
-
-		if ( !pos ) {
-			pos = this.position;
-		}
-		var mod = d === "absolute" ? 1 : -1,
-			scroll = this.cssPosition === "absolute" &&
-				!( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
-				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ?
-					this.offsetParent :
-					this.scrollParent,
-			scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName );
-
-		return {
-			top: (
-
-				// The absolute mouse position
-				pos.top	+
-
-				// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.relative.top * mod +
-
-				// The offsetParent's offset without borders (offset + border)
-				this.offset.parent.top * mod -
-				( ( this.cssPosition === "fixed" ?
-					-this.scrollParent.scrollTop() :
-					( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod )
-			),
-			left: (
-
-				// The absolute mouse position
-				pos.left +
-
-				// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.relative.left * mod +
-
-				// The offsetParent's offset without borders (offset + border)
-				this.offset.parent.left * mod	-
-				( ( this.cssPosition === "fixed" ?
-					-this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 :
-					scroll.scrollLeft() ) * mod )
-			)
-		};
-
-	},
-
-	_generatePosition: function( event ) {
-
-		var top, left,
-			o = this.options,
-			pageX = event.pageX,
-			pageY = event.pageY,
-			scroll = this.cssPosition === "absolute" &&
-				!( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
-				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ?
-					this.offsetParent :
-					this.scrollParent,
-				scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName );
-
-		// This is another very weird special case that only happens for relative elements:
-		// 1. If the css position is relative
-		// 2. and the scroll parent is the document or similar to the offset parent
-		// we have to refresh the relative offset during the scroll so there are no jumps
-		if ( this.cssPosition === "relative" && !( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
-				this.scrollParent[ 0 ] !== this.offsetParent[ 0 ] ) ) {
-			this.offset.relative = this._getRelativeOffset();
-		}
-
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-
-		if ( this.originalPosition ) { //If we are not dragging yet, we won't check for options
-
-			if ( this.containment ) {
-				if ( event.pageX - this.offset.click.left < this.containment[ 0 ] ) {
-					pageX = this.containment[ 0 ] + this.offset.click.left;
-				}
-				if ( event.pageY - this.offset.click.top < this.containment[ 1 ] ) {
-					pageY = this.containment[ 1 ] + this.offset.click.top;
-				}
-				if ( event.pageX - this.offset.click.left > this.containment[ 2 ] ) {
-					pageX = this.containment[ 2 ] + this.offset.click.left;
-				}
-				if ( event.pageY - this.offset.click.top > this.containment[ 3 ] ) {
-					pageY = this.containment[ 3 ] + this.offset.click.top;
-				}
-			}
-
-			if ( o.grid ) {
-				top = this.originalPageY + Math.round( ( pageY - this.originalPageY ) /
-					o.grid[ 1 ] ) * o.grid[ 1 ];
-				pageY = this.containment ?
-					( ( top - this.offset.click.top >= this.containment[ 1 ] &&
-						top - this.offset.click.top <= this.containment[ 3 ] ) ?
-							top :
-							( ( top - this.offset.click.top >= this.containment[ 1 ] ) ?
-								top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) :
-								top;
-
-				left = this.originalPageX + Math.round( ( pageX - this.originalPageX ) /
-					o.grid[ 0 ] ) * o.grid[ 0 ];
-				pageX = this.containment ?
-					( ( left - this.offset.click.left >= this.containment[ 0 ] &&
-						left - this.offset.click.left <= this.containment[ 2 ] ) ?
-							left :
-							( ( left - this.offset.click.left >= this.containment[ 0 ] ) ?
-								left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) :
-								left;
-			}
-
-		}
-
-		return {
-			top: (
-
-				// The absolute mouse position
-				pageY -
-
-				// Click offset (relative to the element)
-				this.offset.click.top -
-
-				// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.relative.top -
-
-				// The offsetParent's offset without borders (offset + border)
-				this.offset.parent.top +
-				( ( this.cssPosition === "fixed" ?
-					-this.scrollParent.scrollTop() :
-					( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) )
-			),
-			left: (
-
-				// The absolute mouse position
-				pageX -
-
-				// Click offset (relative to the element)
-				this.offset.click.left -
-
-				// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.relative.left -
-
-				// The offsetParent's offset without borders (offset + border)
-				this.offset.parent.left +
-				( ( this.cssPosition === "fixed" ?
-					-this.scrollParent.scrollLeft() :
-					scrollIsRootNode ? 0 : scroll.scrollLeft() ) )
-			)
-		};
-
-	},
-
-	_rearrange: function( event, i, a, hardRefresh ) {
-
-		a ? a[ 0 ].appendChild( this.placeholder[ 0 ] ) :
-			i.item[ 0 ].parentNode.insertBefore( this.placeholder[ 0 ],
-				( this.direction === "down" ? i.item[ 0 ] : i.item[ 0 ].nextSibling ) );
-
-		//Various things done here to improve the performance:
-		// 1. we create a setTimeout, that calls refreshPositions
-		// 2. on the instance, we have a counter variable, that get's higher after every append
-		// 3. on the local scope, we copy the counter variable, and check in the timeout,
-		// if it's still the same
-		// 4. this lets only the last addition to the timeout stack through
-		this.counter = this.counter ? ++this.counter : 1;
-		var counter = this.counter;
-
-		this._delay( function() {
-			if ( counter === this.counter ) {
-
-				//Precompute after each DOM insertion, NOT on mousemove
-				this.refreshPositions( !hardRefresh );
-			}
-		} );
-
-	},
-
-	_clear: function( event, noPropagation ) {
-
-		this.reverting = false;
-
-		// We delay all events that have to be triggered to after the point where the placeholder
-		// has been removed and everything else normalized again
-		var i,
-			delayedTriggers = [];
-
-		// We first have to update the dom position of the actual currentItem
-		// Note: don't do it if the current item is already removed (by a user), or it gets
-		// reappended (see #4088)
-		if ( !this._noFinalSort && this.currentItem.parent().length ) {
-			this.placeholder.before( this.currentItem );
-		}
-		this._noFinalSort = null;
-
-		if ( this.helper[ 0 ] === this.currentItem[ 0 ] ) {
-			for ( i in this._storedCSS ) {
-				if ( this._storedCSS[ i ] === "auto" || this._storedCSS[ i ] === "static" ) {
-					this._storedCSS[ i ] = "";
-				}
-			}
-			this.currentItem.css( this._storedCSS );
-			this._removeClass( this.currentItem, "ui-sortable-helper" );
-		} else {
-			this.currentItem.show();
-		}
-
-		if ( this.fromOutside && !noPropagation ) {
-			delayedTriggers.push( function( event ) {
-				this._trigger( "receive", event, this._uiHash( this.fromOutside ) );
-			} );
-		}
-		if ( ( this.fromOutside ||
-				this.domPosition.prev !==
-				this.currentItem.prev().not( ".ui-sortable-helper" )[ 0 ] ||
-				this.domPosition.parent !== this.currentItem.parent()[ 0 ] ) && !noPropagation ) {
-
-			// Trigger update callback if the DOM position has changed
-			delayedTriggers.push( function( event ) {
-				this._trigger( "update", event, this._uiHash() );
-			} );
-		}
-
-		// Check if the items Container has Changed and trigger appropriate
-		// events.
-		if ( this !== this.currentContainer ) {
-			if ( !noPropagation ) {
-				delayedTriggers.push( function( event ) {
-					this._trigger( "remove", event, this._uiHash() );
-				} );
-				delayedTriggers.push( ( function( c ) {
-					return function( event ) {
-						c._trigger( "receive", event, this._uiHash( this ) );
-					};
-				} ).call( this, this.currentContainer ) );
-				delayedTriggers.push( ( function( c ) {
-					return function( event ) {
-						c._trigger( "update", event, this._uiHash( this ) );
-					};
-				} ).call( this, this.currentContainer ) );
-			}
-		}
-
-		//Post events to containers
-		function delayEvent( type, instance, container ) {
-			return function( event ) {
-				container._trigger( type, event, instance._uiHash( instance ) );
-			};
-		}
-		for ( i = this.containers.length - 1; i >= 0; i-- ) {
-			if ( !noPropagation ) {
-				delayedTriggers.push( delayEvent( "deactivate", this, this.containers[ i ] ) );
-			}
-			if ( this.containers[ i ].containerCache.over ) {
-				delayedTriggers.push( delayEvent( "out", this, this.containers[ i ] ) );
-				this.containers[ i ].containerCache.over = 0;
-			}
-		}
-
-		//Do what was originally in plugins
-		if ( this.storedCursor ) {
-			this.document.find( "body" ).css( "cursor", this.storedCursor );
-			this.storedStylesheet.remove();
-		}
-		if ( this._storedOpacity ) {
-			this.helper.css( "opacity", this._storedOpacity );
-		}
-		if ( this._storedZIndex ) {
-			this.helper.css( "zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex );
-		}
-
-		this.dragging = false;
-
-		if ( !noPropagation ) {
-			this._trigger( "beforeStop", event, this._uiHash() );
-		}
-
-		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately,
-		// it unbinds ALL events from the original node!
-		this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] );
-
-		if ( !this.cancelHelperRemoval ) {
-			if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
-				this.helper.remove();
-			}
-			this.helper = null;
-		}
-
-		if ( !noPropagation ) {
-			for ( i = 0; i < delayedTriggers.length; i++ ) {
-
-				// Trigger all delayed events
-				delayedTriggers[ i ].call( this, event );
-			}
-			this._trigger( "stop", event, this._uiHash() );
-		}
-
-		this.fromOutside = false;
-		return !this.cancelHelperRemoval;
-
-	},
-
-	_trigger: function() {
-		if ( $.Widget.prototype._trigger.apply( this, arguments ) === false ) {
-			this.cancel();
-		}
-	},
-
-	_uiHash: function( _inst ) {
-		var inst = _inst || this;
-		return {
-			helper: inst.helper,
-			placeholder: inst.placeholder || $( [] ),
-			position: inst.position,
-			originalPosition: inst.originalPosition,
-			offset: inst.positionAbs,
-			item: inst.currentItem,
-			sender: _inst ? _inst.element : null
-		};
-	}
-
-} );
-
-
-/*!
- * jQuery UI Spinner 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Spinner
-//>>group: Widgets
-//>>description: Displays buttons to easily input numbers via the keyboard or mouse.
-//>>docs: http://api.jqueryui.com/spinner/
-//>>demos: http://jqueryui.com/spinner/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/spinner.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-function spinnerModifer( fn ) {
-	return function() {
-		var previous = this.element.val();
-		fn.apply( this, arguments );
-		this._refresh();
-		if ( previous !== this.element.val() ) {
-			this._trigger( "change" );
-		}
-	};
-}
-
-$.widget( "ui.spinner", {
-	version: "1.12.1",
-	defaultElement: "<input>",
-	widgetEventPrefix: "spin",
-	options: {
-		classes: {
-			"ui-spinner": "ui-corner-all",
-			"ui-spinner-down": "ui-corner-br",
-			"ui-spinner-up": "ui-corner-tr"
-		},
-		culture: null,
-		icons: {
-			down: "ui-icon-triangle-1-s",
-			up: "ui-icon-triangle-1-n"
-		},
-		incremental: true,
-		max: null,
-		min: null,
-		numberFormat: null,
-		page: 10,
-		step: 1,
-
-		change: null,
-		spin: null,
-		start: null,
-		stop: null
-	},
-
-	_create: function() {
-
-		// handle string values that need to be parsed
-		this._setOption( "max", this.options.max );
-		this._setOption( "min", this.options.min );
-		this._setOption( "step", this.options.step );
-
-		// Only format if there is a value, prevents the field from being marked
-		// as invalid in Firefox, see #9573.
-		if ( this.value() !== "" ) {
-
-			// Format the value, but don't constrain.
-			this._value( this.element.val(), true );
-		}
-
-		this._draw();
-		this._on( this._events );
-		this._refresh();
-
-		// Turning off autocomplete prevents the browser from remembering the
-		// value when navigating through history, so we re-enable autocomplete
-		// if the page is unloaded before the widget is destroyed. #7790
-		this._on( this.window, {
-			beforeunload: function() {
-				this.element.removeAttr( "autocomplete" );
-			}
-		} );
-	},
-
-	_getCreateOptions: function() {
-		var options = this._super();
-		var element = this.element;
-
-		$.each( [ "min", "max", "step" ], function( i, option ) {
-			var value = element.attr( option );
-			if ( value != null && value.length ) {
-				options[ option ] = value;
-			}
-		} );
-
-		return options;
-	},
-
-	_events: {
-		keydown: function( event ) {
-			if ( this._start( event ) && this._keydown( event ) ) {
-				event.preventDefault();
-			}
-		},
-		keyup: "_stop",
-		focus: function() {
-			this.previous = this.element.val();
-		},
-		blur: function( event ) {
-			if ( this.cancelBlur ) {
-				delete this.cancelBlur;
-				return;
-			}
-
-			this._stop();
-			this._refresh();
-			if ( this.previous !== this.element.val() ) {
-				this._trigger( "change", event );
-			}
-		},
-		mousewheel: function( event, delta ) {
-			if ( !delta ) {
-				return;
-			}
-			if ( !this.spinning && !this._start( event ) ) {
-				return false;
-			}
-
-			this._spin( ( delta > 0 ? 1 : -1 ) * this.options.step, event );
-			clearTimeout( this.mousewheelTimer );
-			this.mousewheelTimer = this._delay( function() {
-				if ( this.spinning ) {
-					this._stop( event );
-				}
-			}, 100 );
-			event.preventDefault();
-		},
-		"mousedown .ui-spinner-button": function( event ) {
-			var previous;
-
-			// We never want the buttons to have focus; whenever the user is
-			// interacting with the spinner, the focus should be on the input.
-			// If the input is focused then this.previous is properly set from
-			// when the input first received focus. If the input is not focused
-			// then we need to set this.previous based on the value before spinning.
-			previous = this.element[ 0 ] === $.ui.safeActiveElement( this.document[ 0 ] ) ?
-				this.previous : this.element.val();
-			function checkFocus() {
-				var isActive = this.element[ 0 ] === $.ui.safeActiveElement( this.document[ 0 ] );
-				if ( !isActive ) {
-					this.element.trigger( "focus" );
-					this.previous = previous;
-
-					// support: IE
-					// IE sets focus asynchronously, so we need to check if focus
-					// moved off of the input because the user clicked on the button.
-					this._delay( function() {
-						this.previous = previous;
-					} );
-				}
-			}
-
-			// Ensure focus is on (or stays on) the text field
-			event.preventDefault();
-			checkFocus.call( this );
-
-			// Support: IE
-			// IE doesn't prevent moving focus even with event.preventDefault()
-			// so we set a flag to know when we should ignore the blur event
-			// and check (again) if focus moved off of the input.
-			this.cancelBlur = true;
-			this._delay( function() {
-				delete this.cancelBlur;
-				checkFocus.call( this );
-			} );
-
-			if ( this._start( event ) === false ) {
-				return;
-			}
-
-			this._repeat( null, $( event.currentTarget )
-				.hasClass( "ui-spinner-up" ) ? 1 : -1, event );
-		},
-		"mouseup .ui-spinner-button": "_stop",
-		"mouseenter .ui-spinner-button": function( event ) {
-
-			// button will add ui-state-active if mouse was down while mouseleave and kept down
-			if ( !$( event.currentTarget ).hasClass( "ui-state-active" ) ) {
-				return;
-			}
-
-			if ( this._start( event ) === false ) {
-				return false;
-			}
-			this._repeat( null, $( event.currentTarget )
-				.hasClass( "ui-spinner-up" ) ? 1 : -1, event );
-		},
-
-		// TODO: do we really want to consider this a stop?
-		// shouldn't we just stop the repeater and wait until mouseup before
-		// we trigger the stop event?
-		"mouseleave .ui-spinner-button": "_stop"
-	},
-
-	// Support mobile enhanced option and make backcompat more sane
-	_enhance: function() {
-		this.uiSpinner = this.element
-			.attr( "autocomplete", "off" )
-			.wrap( "<span>" )
-			.parent()
-
-				// Add buttons
-				.append(
-					"<a></a><a></a>"
-				);
-	},
-
-	_draw: function() {
-		this._enhance();
-
-		this._addClass( this.uiSpinner, "ui-spinner", "ui-widget ui-widget-content" );
-		this._addClass( "ui-spinner-input" );
-
-		this.element.attr( "role", "spinbutton" );
-
-		// Button bindings
-		this.buttons = this.uiSpinner.children( "a" )
-			.attr( "tabIndex", -1 )
-			.attr( "aria-hidden", true )
-			.button( {
-				classes: {
-					"ui-button": ""
-				}
-			} );
-
-		// TODO: Right now button does not support classes this is already updated in button PR
-		this._removeClass( this.buttons, "ui-corner-all" );
-
-		this._addClass( this.buttons.first(), "ui-spinner-button ui-spinner-up" );
-		this._addClass( this.buttons.last(), "ui-spinner-button ui-spinner-down" );
-		this.buttons.first().button( {
-			"icon": this.options.icons.up,
-			"showLabel": false
-		} );
-		this.buttons.last().button( {
-			"icon": this.options.icons.down,
-			"showLabel": false
-		} );
-
-		// IE 6 doesn't understand height: 50% for the buttons
-		// unless the wrapper has an explicit height
-		if ( this.buttons.height() > Math.ceil( this.uiSpinner.height() * 0.5 ) &&
-				this.uiSpinner.height() > 0 ) {
-			this.uiSpinner.height( this.uiSpinner.height() );
-		}
-	},
-
-	_keydown: function( event ) {
-		var options = this.options,
-			keyCode = $.ui.keyCode;
-
-		switch ( event.keyCode ) {
-		case keyCode.UP:
-			this._repeat( null, 1, event );
-			return true;
-		case keyCode.DOWN:
-			this._repeat( null, -1, event );
-			return true;
-		case keyCode.PAGE_UP:
-			this._repeat( null, options.page, event );
-			return true;
-		case keyCode.PAGE_DOWN:
-			this._repeat( null, -options.page, event );
-			return true;
-		}
-
-		return false;
-	},
-
-	_start: function( event ) {
-		if ( !this.spinning && this._trigger( "start", event ) === false ) {
-			return false;
-		}
-
-		if ( !this.counter ) {
-			this.counter = 1;
-		}
-		this.spinning = true;
-		return true;
-	},
-
-	_repeat: function( i, steps, event ) {
-		i = i || 500;
-
-		clearTimeout( this.timer );
-		this.timer = this._delay( function() {
-			this._repeat( 40, steps, event );
-		}, i );
-
-		this._spin( steps * this.options.step, event );
-	},
-
-	_spin: function( step, event ) {
-		var value = this.value() || 0;
-
-		if ( !this.counter ) {
-			this.counter = 1;
-		}
-
-		value = this._adjustValue( value + step * this._increment( this.counter ) );
-
-		if ( !this.spinning || this._trigger( "spin", event, { value: value } ) !== false ) {
-			this._value( value );
-			this.counter++;
-		}
-	},
-
-	_increment: function( i ) {
-		var incremental = this.options.incremental;
-
-		if ( incremental ) {
-			return $.isFunction( incremental ) ?
-				incremental( i ) :
-				Math.floor( i * i * i / 50000 - i * i / 500 + 17 * i / 200 + 1 );
-		}
-
-		return 1;
-	},
-
-	_precision: function() {
-		var precision = this._precisionOf( this.options.step );
-		if ( this.options.min !== null ) {
-			precision = Math.max( precision, this._precisionOf( this.options.min ) );
-		}
-		return precision;
-	},
-
-	_precisionOf: function( num ) {
-		var str = num.toString(),
-			decimal = str.indexOf( "." );
-		return decimal === -1 ? 0 : str.length - decimal - 1;
-	},
-
-	_adjustValue: function( value ) {
-		var base, aboveMin,
-			options = this.options;
-
-		// Make sure we're at a valid step
-		// - find out where we are relative to the base (min or 0)
-		base = options.min !== null ? options.min : 0;
-		aboveMin = value - base;
-
-		// - round to the nearest step
-		aboveMin = Math.round( aboveMin / options.step ) * options.step;
-
-		// - rounding is based on 0, so adjust back to our base
-		value = base + aboveMin;
-
-		// Fix precision from bad JS floating point math
-		value = parseFloat( value.toFixed( this._precision() ) );
-
-		// Clamp the value
-		if ( options.max !== null && value > options.max ) {
-			return options.max;
-		}
-		if ( options.min !== null && value < options.min ) {
-			return options.min;
-		}
-
-		return value;
-	},
-
-	_stop: function( event ) {
-		if ( !this.spinning ) {
-			return;
-		}
-
-		clearTimeout( this.timer );
-		clearTimeout( this.mousewheelTimer );
-		this.counter = 0;
-		this.spinning = false;
-		this._trigger( "stop", event );
-	},
-
-	_setOption: function( key, value ) {
-		var prevValue, first, last;
-
-		if ( key === "culture" || key === "numberFormat" ) {
-			prevValue = this._parse( this.element.val() );
-			this.options[ key ] = value;
-			this.element.val( this._format( prevValue ) );
-			return;
-		}
-
-		if ( key === "max" || key === "min" || key === "step" ) {
-			if ( typeof value === "string" ) {
-				value = this._parse( value );
-			}
-		}
-		if ( key === "icons" ) {
-			first = this.buttons.first().find( ".ui-icon" );
-			this._removeClass( first, null, this.options.icons.up );
-			this._addClass( first, null, value.up );
-			last = this.buttons.last().find( ".ui-icon" );
-			this._removeClass( last, null, this.options.icons.down );
-			this._addClass( last, null, value.down );
-		}
-
-		this._super( key, value );
-	},
-
-	_setOptionDisabled: function( value ) {
-		this._super( value );
-
-		this._toggleClass( this.uiSpinner, null, "ui-state-disabled", !!value );
-		this.element.prop( "disabled", !!value );
-		this.buttons.button( value ? "disable" : "enable" );
-	},
-
-	_setOptions: spinnerModifer( function( options ) {
-		this._super( options );
-	} ),
-
-	_parse: function( val ) {
-		if ( typeof val === "string" && val !== "" ) {
-			val = window.Globalize && this.options.numberFormat ?
-				Globalize.parseFloat( val, 10, this.options.culture ) : +val;
-		}
-		return val === "" || isNaN( val ) ? null : val;
-	},
-
-	_format: function( value ) {
-		if ( value === "" ) {
-			return "";
-		}
-		return window.Globalize && this.options.numberFormat ?
-			Globalize.format( value, this.options.numberFormat, this.options.culture ) :
-			value;
-	},
-
-	_refresh: function() {
-		this.element.attr( {
-			"aria-valuemin": this.options.min,
-			"aria-valuemax": this.options.max,
-
-			// TODO: what should we do with values that can't be parsed?
-			"aria-valuenow": this._parse( this.element.val() )
-		} );
-	},
-
-	isValid: function() {
-		var value = this.value();
-
-		// Null is invalid
-		if ( value === null ) {
-			return false;
-		}
-
-		// If value gets adjusted, it's invalid
-		return value === this._adjustValue( value );
-	},
-
-	// Update the value without triggering change
-	_value: function( value, allowAny ) {
-		var parsed;
-		if ( value !== "" ) {
-			parsed = this._parse( value );
-			if ( parsed !== null ) {
-				if ( !allowAny ) {
-					parsed = this._adjustValue( parsed );
-				}
-				value = this._format( parsed );
-			}
-		}
-		this.element.val( value );
-		this._refresh();
-	},
-
-	_destroy: function() {
-		this.element
-			.prop( "disabled", false )
-			.removeAttr( "autocomplete role aria-valuemin aria-valuemax aria-valuenow" );
-
-		this.uiSpinner.replaceWith( this.element );
-	},
-
-	stepUp: spinnerModifer( function( steps ) {
-		this._stepUp( steps );
-	} ),
-	_stepUp: function( steps ) {
-		if ( this._start() ) {
-			this._spin( ( steps || 1 ) * this.options.step );
-			this._stop();
-		}
-	},
-
-	stepDown: spinnerModifer( function( steps ) {
-		this._stepDown( steps );
-	} ),
-	_stepDown: function( steps ) {
-		if ( this._start() ) {
-			this._spin( ( steps || 1 ) * -this.options.step );
-			this._stop();
-		}
-	},
-
-	pageUp: spinnerModifer( function( pages ) {
-		this._stepUp( ( pages || 1 ) * this.options.page );
-	} ),
-
-	pageDown: spinnerModifer( function( pages ) {
-		this._stepDown( ( pages || 1 ) * this.options.page );
-	} ),
-
-	value: function( newVal ) {
-		if ( !arguments.length ) {
-			return this._parse( this.element.val() );
-		}
-		spinnerModifer( this._value ).call( this, newVal );
-	},
-
-	widget: function() {
-		return this.uiSpinner;
-	}
-} );
-
-// DEPRECATED
-// TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
-
-	// Backcompat for spinner html extension points
-	$.widget( "ui.spinner", $.ui.spinner, {
-		_enhance: function() {
-			this.uiSpinner = this.element
-				.attr( "autocomplete", "off" )
-				.wrap( this._uiSpinnerHtml() )
-				.parent()
-
-					// Add buttons
-					.append( this._buttonHtml() );
-		},
-		_uiSpinnerHtml: function() {
-			return "<span>";
-		},
-
-		_buttonHtml: function() {
-			return "<a></a><a></a>";
-		}
-	} );
-}
-
-var widgetsSpinner = $.ui.spinner;
-
-
-/*!
- * jQuery UI Tabs 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Tabs
-//>>group: Widgets
-//>>description: Transforms a set of container elements into a tab structure.
-//>>docs: http://api.jqueryui.com/tabs/
-//>>demos: http://jqueryui.com/tabs/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/tabs.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-$.widget( "ui.tabs", {
-	version: "1.12.1",
-	delay: 300,
-	options: {
-		active: null,
-		classes: {
-			"ui-tabs": "ui-corner-all",
-			"ui-tabs-nav": "ui-corner-all",
-			"ui-tabs-panel": "ui-corner-bottom",
-			"ui-tabs-tab": "ui-corner-top"
-		},
-		collapsible: false,
-		event: "click",
-		heightStyle: "content",
-		hide: null,
-		show: null,
-
-		// Callbacks
-		activate: null,
-		beforeActivate: null,
-		beforeLoad: null,
-		load: null
-	},
-
-	_isLocal: ( function() {
-		var rhash = /#.*$/;
-
-		return function( anchor ) {
-			var anchorUrl, locationUrl;
-
-			anchorUrl = anchor.href.replace( rhash, "" );
-			locationUrl = location.href.replace( rhash, "" );
-
-			// Decoding may throw an error if the URL isn't UTF-8 (#9518)
-			try {
-				anchorUrl = decodeURIComponent( anchorUrl );
-			} catch ( error ) {}
-			try {
-				locationUrl = decodeURIComponent( locationUrl );
-			} catch ( error ) {}
-
-			return anchor.hash.length > 1 && anchorUrl === locationUrl;
-		};
-	} )(),
-
-	_create: function() {
-		var that = this,
-			options = this.options;
-
-		this.running = false;
-
-		this._addClass( "ui-tabs", "ui-widget ui-widget-content" );
-		this._toggleClass( "ui-tabs-collapsible", null, options.collapsible );
-
-		this._processTabs();
-		options.active = this._initialActive();
-
-		// Take disabling tabs via class attribute from HTML
-		// into account and update option properly.
-		if ( $.isArray( options.disabled ) ) {
-			options.disabled = $.unique( options.disabled.concat(
-				$.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) {
-					return that.tabs.index( li );
-				} )
-			) ).sort();
-		}
-
-		// Check for length avoids error when initializing empty list
-		if ( this.options.active !== false && this.anchors.length ) {
-			this.active = this._findActive( options.active );
-		} else {
-			this.active = $();
-		}
-
-		this._refresh();
-
-		if ( this.active.length ) {
-			this.load( options.active );
-		}
-	},
-
-	_initialActive: function() {
-		var active = this.options.active,
-			collapsible = this.options.collapsible,
-			locationHash = location.hash.substring( 1 );
-
-		if ( active === null ) {
-
-			// check the fragment identifier in the URL
-			if ( locationHash ) {
-				this.tabs.each( function( i, tab ) {
-					if ( $( tab ).attr( "aria-controls" ) === locationHash ) {
-						active = i;
-						return false;
-					}
-				} );
-			}
-
-			// Check for a tab marked active via a class
-			if ( active === null ) {
-				active = this.tabs.index( this.tabs.filter( ".ui-tabs-active" ) );
-			}
-
-			// No active tab, set to false
-			if ( active === null || active === -1 ) {
-				active = this.tabs.length ? 0 : false;
-			}
-		}
-
-		// Handle numbers: negative, out of range
-		if ( active !== false ) {
-			active = this.tabs.index( this.tabs.eq( active ) );
-			if ( active === -1 ) {
-				active = collapsible ? false : 0;
-			}
-		}
-
-		// Don't allow collapsible: false and active: false
-		if ( !collapsible && active === false && this.anchors.length ) {
-			active = 0;
-		}
-
-		return active;
-	},
-
-	_getCreateEventData: function() {
-		return {
-			tab: this.active,
-			panel: !this.active.length ? $() : this._getPanelForTab( this.active )
-		};
-	},
-
-	_tabKeydown: function( event ) {
-		var focusedTab = $( $.ui.safeActiveElement( this.document[ 0 ] ) ).closest( "li" ),
-			selectedIndex = this.tabs.index( focusedTab ),
-			goingForward = true;
-
-		if ( this._handlePageNav( event ) ) {
-			return;
-		}
-
-		switch ( event.keyCode ) {
-		case $.ui.keyCode.RIGHT:
-		case $.ui.keyCode.DOWN:
-			selectedIndex++;
-			break;
-		case $.ui.keyCode.UP:
-		case $.ui.keyCode.LEFT:
-			goingForward = false;
-			selectedIndex--;
-			break;
-		case $.ui.keyCode.END:
-			selectedIndex = this.anchors.length - 1;
-			break;
-		case $.ui.keyCode.HOME:
-			selectedIndex = 0;
-			break;
-		case $.ui.keyCode.SPACE:
-
-			// Activate only, no collapsing
-			event.preventDefault();
-			clearTimeout( this.activating );
-			this._activate( selectedIndex );
-			return;
-		case $.ui.keyCode.ENTER:
-
-			// Toggle (cancel delayed activation, allow collapsing)
-			event.preventDefault();
-			clearTimeout( this.activating );
-
-			// Determine if we should collapse or activate
-			this._activate( selectedIndex === this.options.active ? false : selectedIndex );
-			return;
-		default:
-			return;
-		}
-
-		// Focus the appropriate tab, based on which key was pressed
-		event.preventDefault();
-		clearTimeout( this.activating );
-		selectedIndex = this._focusNextTab( selectedIndex, goingForward );
-
-		// Navigating with control/command key will prevent automatic activation
-		if ( !event.ctrlKey && !event.metaKey ) {
-
-			// Update aria-selected immediately so that AT think the tab is already selected.
-			// Otherwise AT may confuse the user by stating that they need to activate the tab,
-			// but the tab will already be activated by the time the announcement finishes.
-			focusedTab.attr( "aria-selected", "false" );
-			this.tabs.eq( selectedIndex ).attr( "aria-selected", "true" );
-
-			this.activating = this._delay( function() {
-				this.option( "active", selectedIndex );
-			}, this.delay );
-		}
-	},
-
-	_panelKeydown: function( event ) {
-		if ( this._handlePageNav( event ) ) {
-			return;
-		}
-
-		// Ctrl+up moves focus to the current tab
-		if ( event.ctrlKey && event.keyCode === $.ui.keyCode.UP ) {
-			event.preventDefault();
-			this.active.trigger( "focus" );
-		}
-	},
-
-	// Alt+page up/down moves focus to the previous/next tab (and activates)
-	_handlePageNav: function( event ) {
-		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_UP ) {
-			this._activate( this._focusNextTab( this.options.active - 1, false ) );
-			return true;
-		}
-		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_DOWN ) {
-			this._activate( this._focusNextTab( this.options.active + 1, true ) );
-			return true;
-		}
-	},
-
-	_findNextTab: function( index, goingForward ) {
-		var lastTabIndex = this.tabs.length - 1;
-
-		function constrain() {
-			if ( index > lastTabIndex ) {
-				index = 0;
-			}
-			if ( index < 0 ) {
-				index = lastTabIndex;
-			}
-			return index;
-		}
-
-		while ( $.inArray( constrain(), this.options.disabled ) !== -1 ) {
-			index = goingForward ? index + 1 : index - 1;
-		}
-
-		return index;
-	},
-
-	_focusNextTab: function( index, goingForward ) {
-		index = this._findNextTab( index, goingForward );
-		this.tabs.eq( index ).trigger( "focus" );
-		return index;
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "active" ) {
-
-			// _activate() will handle invalid values and update this.options
-			this._activate( value );
-			return;
-		}
-
-		this._super( key, value );
-
-		if ( key === "collapsible" ) {
-			this._toggleClass( "ui-tabs-collapsible", null, value );
-
-			// Setting collapsible: false while collapsed; open first panel
-			if ( !value && this.options.active === false ) {
-				this._activate( 0 );
-			}
-		}
-
-		if ( key === "event" ) {
-			this._setupEvents( value );
-		}
-
-		if ( key === "heightStyle" ) {
-			this._setupHeightStyle( value );
-		}
-	},
-
-	_sanitizeSelector: function( hash ) {
-		return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g, "\\$&" ) : "";
-	},
-
-	refresh: function() {
-		var options = this.options,
-			lis = this.tablist.children( ":has(a[href])" );
-
-		// Get disabled tabs from class attribute from HTML
-		// this will get converted to a boolean if needed in _refresh()
-		options.disabled = $.map( lis.filter( ".ui-state-disabled" ), function( tab ) {
-			return lis.index( tab );
-		} );
-
-		this._processTabs();
-
-		// Was collapsed or no tabs
-		if ( options.active === false || !this.anchors.length ) {
-			options.active = false;
-			this.active = $();
-
-		// was active, but active tab is gone
-		} else if ( this.active.length && !$.contains( this.tablist[ 0 ], this.active[ 0 ] ) ) {
-
-			// all remaining tabs are disabled
-			if ( this.tabs.length === options.disabled.length ) {
-				options.active = false;
-				this.active = $();
-
-			// activate previous tab
-			} else {
-				this._activate( this._findNextTab( Math.max( 0, options.active - 1 ), false ) );
-			}
-
-		// was active, active tab still exists
-		} else {
-
-			// make sure active index is correct
-			options.active = this.tabs.index( this.active );
-		}
-
-		this._refresh();
-	},
-
-	_refresh: function() {
-		this._setOptionDisabled( this.options.disabled );
-		this._setupEvents( this.options.event );
-		this._setupHeightStyle( this.options.heightStyle );
-
-		this.tabs.not( this.active ).attr( {
-			"aria-selected": "false",
-			"aria-expanded": "false",
-			tabIndex: -1
-		} );
-		this.panels.not( this._getPanelForTab( this.active ) )
-			.hide()
-			.attr( {
-				"aria-hidden": "true"
-			} );
-
-		// Make sure one tab is in the tab order
-		if ( !this.active.length ) {
-			this.tabs.eq( 0 ).attr( "tabIndex", 0 );
-		} else {
-			this.active
-				.attr( {
-					"aria-selected": "true",
-					"aria-expanded": "true",
-					tabIndex: 0
-				} );
-			this._addClass( this.active, "ui-tabs-active", "ui-state-active" );
-			this._getPanelForTab( this.active )
-				.show()
-				.attr( {
-					"aria-hidden": "false"
-				} );
-		}
-	},
-
-	_processTabs: function() {
-		var that = this,
-			prevTabs = this.tabs,
-			prevAnchors = this.anchors,
-			prevPanels = this.panels;
-
-		this.tablist = this._getList().attr( "role", "tablist" );
-		this._addClass( this.tablist, "ui-tabs-nav",
-			"ui-helper-reset ui-helper-clearfix ui-widget-header" );
-
-		// Prevent users from focusing disabled tabs via click
-		this.tablist
-			.on( "mousedown" + this.eventNamespace, "> li", function( event ) {
-				if ( $( this ).is( ".ui-state-disabled" ) ) {
-					event.preventDefault();
-				}
-			} )
-
-			// Support: IE <9
-			// Preventing the default action in mousedown doesn't prevent IE
-			// from focusing the element, so if the anchor gets focused, blur.
-			// We don't have to worry about focusing the previously focused
-			// element since clicking on a non-focusable element should focus
-			// the body anyway.
-			.on( "focus" + this.eventNamespace, ".ui-tabs-anchor", function() {
-				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
-					this.blur();
-				}
-			} );
-
-		this.tabs = this.tablist.find( "> li:has(a[href])" )
-			.attr( {
-				role: "tab",
-				tabIndex: -1
-			} );
-		this._addClass( this.tabs, "ui-tabs-tab", "ui-state-default" );
-
-		this.anchors = this.tabs.map( function() {
-			return $( "a", this )[ 0 ];
-		} )
-			.attr( {
-				role: "presentation",
-				tabIndex: -1
-			} );
-		this._addClass( this.anchors, "ui-tabs-anchor" );
-
-		this.panels = $();
-
-		this.anchors.each( function( i, anchor ) {
-			var selector, panel, panelId,
-				anchorId = $( anchor ).uniqueId().attr( "id" ),
-				tab = $( anchor ).closest( "li" ),
-				originalAriaControls = tab.attr( "aria-controls" );
-
-			// Inline tab
-			if ( that._isLocal( anchor ) ) {
-				selector = anchor.hash;
-				panelId = selector.substring( 1 );
-				panel = that.element.find( that._sanitizeSelector( selector ) );
-
-			// remote tab
-			} else {
-
-				// If the tab doesn't already have aria-controls,
-				// generate an id by using a throw-away element
-				panelId = tab.attr( "aria-controls" ) || $( {} ).uniqueId()[ 0 ].id;
-				selector = "#" + panelId;
-				panel = that.element.find( selector );
-				if ( !panel.length ) {
-					panel = that._createPanel( panelId );
-					panel.insertAfter( that.panels[ i - 1 ] || that.tablist );
-				}
-				panel.attr( "aria-live", "polite" );
-			}
-
-			if ( panel.length ) {
-				that.panels = that.panels.add( panel );
-			}
-			if ( originalAriaControls ) {
-				tab.data( "ui-tabs-aria-controls", originalAriaControls );
-			}
-			tab.attr( {
-				"aria-controls": panelId,
-				"aria-labelledby": anchorId
-			} );
-			panel.attr( "aria-labelledby", anchorId );
-		} );
-
-		this.panels.attr( "role", "tabpanel" );
-		this._addClass( this.panels, "ui-tabs-panel", "ui-widget-content" );
-
-		// Avoid memory leaks (#10056)
-		if ( prevTabs ) {
-			this._off( prevTabs.not( this.tabs ) );
-			this._off( prevAnchors.not( this.anchors ) );
-			this._off( prevPanels.not( this.panels ) );
-		}
-	},
-
-	// Allow overriding how to find the list for rare usage scenarios (#7715)
-	_getList: function() {
-		return this.tablist || this.element.find( "ol, ul" ).eq( 0 );
-	},
-
-	_createPanel: function( id ) {
-		return $( "<div>" )
-			.attr( "id", id )
-			.data( "ui-tabs-destroy", true );
-	},
-
-	_setOptionDisabled: function( disabled ) {
-		var currentItem, li, i;
-
-		if ( $.isArray( disabled ) ) {
-			if ( !disabled.length ) {
-				disabled = false;
-			} else if ( disabled.length === this.anchors.length ) {
-				disabled = true;
-			}
-		}
-
-		// Disable tabs
-		for ( i = 0; ( li = this.tabs[ i ] ); i++ ) {
-			currentItem = $( li );
-			if ( disabled === true || $.inArray( i, disabled ) !== -1 ) {
-				currentItem.attr( "aria-disabled", "true" );
-				this._addClass( currentItem, null, "ui-state-disabled" );
-			} else {
-				currentItem.removeAttr( "aria-disabled" );
-				this._removeClass( currentItem, null, "ui-state-disabled" );
-			}
-		}
-
-		this.options.disabled = disabled;
-
-		this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null,
-			disabled === true );
-	},
-
-	_setupEvents: function( event ) {
-		var events = {};
-		if ( event ) {
-			$.each( event.split( " " ), function( index, eventName ) {
-				events[ eventName ] = "_eventHandler";
-			} );
-		}
-
-		this._off( this.anchors.add( this.tabs ).add( this.panels ) );
-
-		// Always prevent the default action, even when disabled
-		this._on( true, this.anchors, {
-			click: function( event ) {
-				event.preventDefault();
-			}
-		} );
-		this._on( this.anchors, events );
-		this._on( this.tabs, { keydown: "_tabKeydown" } );
-		this._on( this.panels, { keydown: "_panelKeydown" } );
-
-		this._focusable( this.tabs );
-		this._hoverable( this.tabs );
-	},
-
-	_setupHeightStyle: function( heightStyle ) {
-		var maxHeight,
-			parent = this.element.parent();
-
-		if ( heightStyle === "fill" ) {
-			maxHeight = parent.height();
-			maxHeight -= this.element.outerHeight() - this.element.height();
-
-			this.element.siblings( ":visible" ).each( function() {
-				var elem = $( this ),
-					position = elem.css( "position" );
-
-				if ( position === "absolute" || position === "fixed" ) {
-					return;
-				}
-				maxHeight -= elem.outerHeight( true );
-			} );
-
-			this.element.children().not( this.panels ).each( function() {
-				maxHeight -= $( this ).outerHeight( true );
-			} );
-
-			this.panels.each( function() {
-				$( this ).height( Math.max( 0, maxHeight -
-					$( this ).innerHeight() + $( this ).height() ) );
-			} )
-				.css( "overflow", "auto" );
-		} else if ( heightStyle === "auto" ) {
-			maxHeight = 0;
-			this.panels.each( function() {
-				maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
-			} ).height( maxHeight );
-		}
-	},
-
-	_eventHandler: function( event ) {
-		var options = this.options,
-			active = this.active,
-			anchor = $( event.currentTarget ),
-			tab = anchor.closest( "li" ),
-			clickedIsActive = tab[ 0 ] === active[ 0 ],
-			collapsing = clickedIsActive && options.collapsible,
-			toShow = collapsing ? $() : this._getPanelForTab( tab ),
-			toHide = !active.length ? $() : this._getPanelForTab( active ),
-			eventData = {
-				oldTab: active,
-				oldPanel: toHide,
-				newTab: collapsing ? $() : tab,
-				newPanel: toShow
-			};
-
-		event.preventDefault();
-
-		if ( tab.hasClass( "ui-state-disabled" ) ||
-
-				// tab is already loading
-				tab.hasClass( "ui-tabs-loading" ) ||
-
-				// can't switch durning an animation
-				this.running ||
-
-				// click on active header, but not collapsible
-				( clickedIsActive && !options.collapsible ) ||
-
-				// allow canceling activation
-				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
-			return;
-		}
-
-		options.active = collapsing ? false : this.tabs.index( tab );
-
-		this.active = clickedIsActive ? $() : tab;
-		if ( this.xhr ) {
-			this.xhr.abort();
-		}
-
-		if ( !toHide.length && !toShow.length ) {
-			$.error( "jQuery UI Tabs: Mismatching fragment identifier." );
-		}
-
-		if ( toShow.length ) {
-			this.load( this.tabs.index( tab ), event );
-		}
-		this._toggle( event, eventData );
-	},
-
-	// Handles show/hide for selecting tabs
-	_toggle: function( event, eventData ) {
-		var that = this,
-			toShow = eventData.newPanel,
-			toHide = eventData.oldPanel;
-
-		this.running = true;
-
-		function complete() {
-			that.running = false;
-			that._trigger( "activate", event, eventData );
-		}
-
-		function show() {
-			that._addClass( eventData.newTab.closest( "li" ), "ui-tabs-active", "ui-state-active" );
-
-			if ( toShow.length && that.options.show ) {
-				that._show( toShow, that.options.show, complete );
-			} else {
-				toShow.show();
-				complete();
-			}
-		}
-
-		// Start out by hiding, then showing, then completing
-		if ( toHide.length && this.options.hide ) {
-			this._hide( toHide, this.options.hide, function() {
-				that._removeClass( eventData.oldTab.closest( "li" ),
-					"ui-tabs-active", "ui-state-active" );
-				show();
-			} );
-		} else {
-			this._removeClass( eventData.oldTab.closest( "li" ),
-				"ui-tabs-active", "ui-state-active" );
-			toHide.hide();
-			show();
-		}
-
-		toHide.attr( "aria-hidden", "true" );
-		eventData.oldTab.attr( {
-			"aria-selected": "false",
-			"aria-expanded": "false"
-		} );
-
-		// If we're switching tabs, remove the old tab from the tab order.
-		// If we're opening from collapsed state, remove the previous tab from the tab order.
-		// If we're collapsing, then keep the collapsing tab in the tab order.
-		if ( toShow.length && toHide.length ) {
-			eventData.oldTab.attr( "tabIndex", -1 );
-		} else if ( toShow.length ) {
-			this.tabs.filter( function() {
-				return $( this ).attr( "tabIndex" ) === 0;
-			} )
-				.attr( "tabIndex", -1 );
-		}
-
-		toShow.attr( "aria-hidden", "false" );
-		eventData.newTab.attr( {
-			"aria-selected": "true",
-			"aria-expanded": "true",
-			tabIndex: 0
-		} );
-	},
-
-	_activate: function( index ) {
-		var anchor,
-			active = this._findActive( index );
-
-		// Trying to activate the already active panel
-		if ( active[ 0 ] === this.active[ 0 ] ) {
-			return;
-		}
-
-		// Trying to collapse, simulate a click on the current active header
-		if ( !active.length ) {
-			active = this.active;
-		}
-
-		anchor = active.find( ".ui-tabs-anchor" )[ 0 ];
-		this._eventHandler( {
-			target: anchor,
-			currentTarget: anchor,
-			preventDefault: $.noop
-		} );
-	},
-
-	_findActive: function( index ) {
-		return index === false ? $() : this.tabs.eq( index );
-	},
-
-	_getIndex: function( index ) {
-
-		// meta-function to give users option to provide a href string instead of a numerical index.
-		if ( typeof index === "string" ) {
-			index = this.anchors.index( this.anchors.filter( "[href$='" +
-				$.ui.escapeSelector( index ) + "']" ) );
-		}
-
-		return index;
-	},
-
-	_destroy: function() {
-		if ( this.xhr ) {
-			this.xhr.abort();
-		}
-
-		this.tablist
-			.removeAttr( "role" )
-			.off( this.eventNamespace );
-
-		this.anchors
-			.removeAttr( "role tabIndex" )
-			.removeUniqueId();
-
-		this.tabs.add( this.panels ).each( function() {
-			if ( $.data( this, "ui-tabs-destroy" ) ) {
-				$( this ).remove();
-			} else {
-				$( this ).removeAttr( "role tabIndex " +
-					"aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded" );
-			}
-		} );
-
-		this.tabs.each( function() {
-			var li = $( this ),
-				prev = li.data( "ui-tabs-aria-controls" );
-			if ( prev ) {
-				li
-					.attr( "aria-controls", prev )
-					.removeData( "ui-tabs-aria-controls" );
-			} else {
-				li.removeAttr( "aria-controls" );
-			}
-		} );
-
-		this.panels.show();
-
-		if ( this.options.heightStyle !== "content" ) {
-			this.panels.css( "height", "" );
-		}
-	},
-
-	enable: function( index ) {
-		var disabled = this.options.disabled;
-		if ( disabled === false ) {
-			return;
-		}
-
-		if ( index === undefined ) {
-			disabled = false;
-		} else {
-			index = this._getIndex( index );
-			if ( $.isArray( disabled ) ) {
-				disabled = $.map( disabled, function( num ) {
-					return num !== index ? num : null;
-				} );
-			} else {
-				disabled = $.map( this.tabs, function( li, num ) {
-					return num !== index ? num : null;
-				} );
-			}
-		}
-		this._setOptionDisabled( disabled );
-	},
-
-	disable: function( index ) {
-		var disabled = this.options.disabled;
-		if ( disabled === true ) {
-			return;
-		}
-
-		if ( index === undefined ) {
-			disabled = true;
-		} else {
-			index = this._getIndex( index );
-			if ( $.inArray( index, disabled ) !== -1 ) {
-				return;
-			}
-			if ( $.isArray( disabled ) ) {
-				disabled = $.merge( [ index ], disabled ).sort();
-			} else {
-				disabled = [ index ];
-			}
-		}
-		this._setOptionDisabled( disabled );
-	},
-
-	load: function( index, event ) {
-		index = this._getIndex( index );
-		var that = this,
-			tab = this.tabs.eq( index ),
-			anchor = tab.find( ".ui-tabs-anchor" ),
-			panel = this._getPanelForTab( tab ),
-			eventData = {
-				tab: tab,
-				panel: panel
-			},
-			complete = function( jqXHR, status ) {
-				if ( status === "abort" ) {
-					that.panels.stop( false, true );
-				}
-
-				that._removeClass( tab, "ui-tabs-loading" );
-				panel.removeAttr( "aria-busy" );
-
-				if ( jqXHR === that.xhr ) {
-					delete that.xhr;
-				}
-			};
-
-		// Not remote
-		if ( this._isLocal( anchor[ 0 ] ) ) {
-			return;
-		}
-
-		this.xhr = $.ajax( this._ajaxSettings( anchor, event, eventData ) );
-
-		// Support: jQuery <1.8
-		// jQuery <1.8 returns false if the request is canceled in beforeSend,
-		// but as of 1.8, $.ajax() always returns a jqXHR object.
-		if ( this.xhr && this.xhr.statusText !== "canceled" ) {
-			this._addClass( tab, "ui-tabs-loading" );
-			panel.attr( "aria-busy", "true" );
-
-			this.xhr
-				.done( function( response, status, jqXHR ) {
-
-					// support: jQuery <1.8
-					// http://bugs.jquery.com/ticket/11778
-					setTimeout( function() {
-						panel.html( response );
-						that._trigger( "load", event, eventData );
-
-						complete( jqXHR, status );
-					}, 1 );
-				} )
-				.fail( function( jqXHR, status ) {
-
-					// support: jQuery <1.8
-					// http://bugs.jquery.com/ticket/11778
-					setTimeout( function() {
-						complete( jqXHR, status );
-					}, 1 );
-				} );
-		}
-	},
-
-	_ajaxSettings: function( anchor, event, eventData ) {
-		var that = this;
-		return {
-
-			// Support: IE <11 only
-			// Strip any hash that exists to prevent errors with the Ajax request
-			url: anchor.attr( "href" ).replace( /#.*$/, "" ),
-			beforeSend: function( jqXHR, settings ) {
-				return that._trigger( "beforeLoad", event,
-					$.extend( { jqXHR: jqXHR, ajaxSettings: settings }, eventData ) );
-			}
-		};
-	},
-
-	_getPanelForTab: function( tab ) {
-		var id = $( tab ).attr( "aria-controls" );
-		return this.element.find( this._sanitizeSelector( "#" + id ) );
-	}
-} );
-
-// DEPRECATED
-// TODO: Switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
-
-	// Backcompat for ui-tab class (now ui-tabs-tab)
-	$.widget( "ui.tabs", $.ui.tabs, {
-		_processTabs: function() {
-			this._superApply( arguments );
-			this._addClass( this.tabs, "ui-tab" );
-		}
-	} );
-}
-
-var widgetsTabs = $.ui.tabs;
-
-
-/*!
- * jQuery UI Tooltip 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Tooltip
-//>>group: Widgets
-//>>description: Shows additional information for any element on hover or focus.
-//>>docs: http://api.jqueryui.com/tooltip/
-//>>demos: http://jqueryui.com/tooltip/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/tooltip.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-$.widget( "ui.tooltip", {
-	version: "1.12.1",
-	options: {
-		classes: {
-			"ui-tooltip": "ui-corner-all ui-widget-shadow"
-		},
-		content: function() {
-
-			// support: IE<9, Opera in jQuery <1.7
-			// .text() can't accept undefined, so coerce to a string
-			var title = $( this ).attr( "title" ) || "";
-
-			// Escape title, since we're going from an attribute to raw HTML
-			return $( "<a>" ).text( title ).html();
-		},
-		hide: true,
-
-		// Disabled elements have inconsistent behavior across browsers (#8661)
-		items: "[title]:not([disabled])",
-		position: {
-			my: "left top+15",
-			at: "left bottom",
-			collision: "flipfit flip"
-		},
-		show: true,
-		track: false,
-
-		// Callbacks
-		close: null,
-		open: null
-	},
-
-	_addDescribedBy: function( elem, id ) {
-		var describedby = ( elem.attr( "aria-describedby" ) || "" ).split( /\s+/ );
-		describedby.push( id );
-		elem
-			.data( "ui-tooltip-id", id )
-			.attr( "aria-describedby", $.trim( describedby.join( " " ) ) );
-	},
-
-	_removeDescribedBy: function( elem ) {
-		var id = elem.data( "ui-tooltip-id" ),
-			describedby = ( elem.attr( "aria-describedby" ) || "" ).split( /\s+/ ),
-			index = $.inArray( id, describedby );
-
-		if ( index !== -1 ) {
-			describedby.splice( index, 1 );
-		}
-
-		elem.removeData( "ui-tooltip-id" );
-		describedby = $.trim( describedby.join( " " ) );
-		if ( describedby ) {
-			elem.attr( "aria-describedby", describedby );
-		} else {
-			elem.removeAttr( "aria-describedby" );
-		}
-	},
-
-	_create: function() {
-		this._on( {
-			mouseover: "open",
-			focusin: "open"
-		} );
-
-		// IDs of generated tooltips, needed for destroy
-		this.tooltips = {};
-
-		// IDs of parent tooltips where we removed the title attribute
-		this.parents = {};
-
-		// Append the aria-live region so tooltips announce correctly
-		this.liveRegion = $( "<div>" )
-			.attr( {
-				role: "log",
-				"aria-live": "assertive",
-				"aria-relevant": "additions"
-			} )
-			.appendTo( this.document[ 0 ].body );
-		this._addClass( this.liveRegion, null, "ui-helper-hidden-accessible" );
-
-		this.disabledTitles = $( [] );
-	},
-
-	_setOption: function( key, value ) {
-		var that = this;
-
-		this._super( key, value );
-
-		if ( key === "content" ) {
-			$.each( this.tooltips, function( id, tooltipData ) {
-				that._updateContent( tooltipData.element );
-			} );
-		}
-	},
-
-	_setOptionDisabled: function( value ) {
-		this[ value ? "_disable" : "_enable" ]();
-	},
-
-	_disable: function() {
-		var that = this;
-
-		// Close open tooltips
-		$.each( this.tooltips, function( id, tooltipData ) {
-			var event = $.Event( "blur" );
-			event.target = event.currentTarget = tooltipData.element[ 0 ];
-			that.close( event, true );
-		} );
-
-		// Remove title attributes to prevent native tooltips
-		this.disabledTitles = this.disabledTitles.add(
-			this.element.find( this.options.items ).addBack()
-				.filter( function() {
-					var element = $( this );
-					if ( element.is( "[title]" ) ) {
-						return element
-							.data( "ui-tooltip-title", element.attr( "title" ) )
-							.removeAttr( "title" );
-					}
-				} )
-		);
-	},
-
-	_enable: function() {
-
-		// restore title attributes
-		this.disabledTitles.each( function() {
-			var element = $( this );
-			if ( element.data( "ui-tooltip-title" ) ) {
-				element.attr( "title", element.data( "ui-tooltip-title" ) );
-			}
-		} );
-		this.disabledTitles = $( [] );
-	},
-
-	open: function( event ) {
-		var that = this,
-			target = $( event ? event.target : this.element )
-
-				// we need closest here due to mouseover bubbling,
-				// but always pointing at the same event target
-				.closest( this.options.items );
-
-		// No element to show a tooltip for or the tooltip is already open
-		if ( !target.length || target.data( "ui-tooltip-id" ) ) {
-			return;
-		}
-
-		if ( target.attr( "title" ) ) {
-			target.data( "ui-tooltip-title", target.attr( "title" ) );
-		}
-
-		target.data( "ui-tooltip-open", true );
-
-		// Kill parent tooltips, custom or native, for hover
-		if ( event && event.type === "mouseover" ) {
-			target.parents().each( function() {
-				var parent = $( this ),
-					blurEvent;
-				if ( parent.data( "ui-tooltip-open" ) ) {
-					blurEvent = $.Event( "blur" );
-					blurEvent.target = blurEvent.currentTarget = this;
-					that.close( blurEvent, true );
-				}
-				if ( parent.attr( "title" ) ) {
-					parent.uniqueId();
-					that.parents[ this.id ] = {
-						element: this,
-						title: parent.attr( "title" )
-					};
-					parent.attr( "title", "" );
-				}
-			} );
-		}
-
-		this._registerCloseHandlers( event, target );
-		this._updateContent( target, event );
-	},
-
-	_updateContent: function( target, event ) {
-		var content,
-			contentOption = this.options.content,
-			that = this,
-			eventType = event ? event.type : null;
-
-		if ( typeof contentOption === "string" || contentOption.nodeType ||
-				contentOption.jquery ) {
-			return this._open( event, target, contentOption );
-		}
-
-		content = contentOption.call( target[ 0 ], function( response ) {
-
-			// IE may instantly serve a cached response for ajax requests
-			// delay this call to _open so the other call to _open runs first
-			that._delay( function() {
-
-				// Ignore async response if tooltip was closed already
-				if ( !target.data( "ui-tooltip-open" ) ) {
-					return;
-				}
-
-				// JQuery creates a special event for focusin when it doesn't
-				// exist natively. To improve performance, the native event
-				// object is reused and the type is changed. Therefore, we can't
-				// rely on the type being correct after the event finished
-				// bubbling, so we set it back to the previous value. (#8740)
-				if ( event ) {
-					event.type = eventType;
-				}
-				this._open( event, target, response );
-			} );
-		} );
-		if ( content ) {
-			this._open( event, target, content );
-		}
-	},
-
-	_open: function( event, target, content ) {
-		var tooltipData, tooltip, delayedShow, a11yContent,
-			positionOption = $.extend( {}, this.options.position );
-
-		if ( !content ) {
-			return;
-		}
-
-		// Content can be updated multiple times. If the tooltip already
-		// exists, then just update the content and bail.
-		tooltipData = this._find( target );
-		if ( tooltipData ) {
-			tooltipData.tooltip.find( ".ui-tooltip-content" ).html( content );
-			return;
-		}
-
-		// If we have a title, clear it to prevent the native tooltip
-		// we have to check first to avoid defining a title if none exists
-		// (we don't want to cause an element to start matching [title])
-		//
-		// We use removeAttr only for key events, to allow IE to export the correct
-		// accessible attributes. For mouse events, set to empty string to avoid
-		// native tooltip showing up (happens only when removing inside mouseover).
-		if ( target.is( "[title]" ) ) {
-			if ( event && event.type === "mouseover" ) {
-				target.attr( "title", "" );
-			} else {
-				target.removeAttr( "title" );
-			}
-		}
-
-		tooltipData = this._tooltip( target );
-		tooltip = tooltipData.tooltip;
-		this._addDescribedBy( target, tooltip.attr( "id" ) );
-		tooltip.find( ".ui-tooltip-content" ).html( content );
-
-		// Support: Voiceover on OS X, JAWS on IE <= 9
-		// JAWS announces deletions even when aria-relevant="additions"
-		// Voiceover will sometimes re-read the entire log region's contents from the beginning
-		this.liveRegion.children().hide();
-		a11yContent = $( "<div>" ).html( tooltip.find( ".ui-tooltip-content" ).html() );
-		a11yContent.removeAttr( "name" ).find( "[name]" ).removeAttr( "name" );
-		a11yContent.removeAttr( "id" ).find( "[id]" ).removeAttr( "id" );
-		a11yContent.appendTo( this.liveRegion );
-
-		function position( event ) {
-			positionOption.of = event;
-			if ( tooltip.is( ":hidden" ) ) {
-				return;
-			}
-			tooltip.position( positionOption );
-		}
-		if ( this.options.track && event && /^mouse/.test( event.type ) ) {
-			this._on( this.document, {
-				mousemove: position
-			} );
-
-			// trigger once to override element-relative positioning
-			position( event );
-		} else {
-			tooltip.position( $.extend( {
-				of: target
-			}, this.options.position ) );
-		}
-
-		tooltip.hide();
-
-		this._show( tooltip, this.options.show );
-
-		// Handle tracking tooltips that are shown with a delay (#8644). As soon
-		// as the tooltip is visible, position the tooltip using the most recent
-		// event.
-		// Adds the check to add the timers only when both delay and track options are set (#14682)
-		if ( this.options.track && this.options.show && this.options.show.delay ) {
-			delayedShow = this.delayedShow = setInterval( function() {
-				if ( tooltip.is( ":visible" ) ) {
-					position( positionOption.of );
-					clearInterval( delayedShow );
-				}
-			}, $.fx.interval );
-		}
-
-		this._trigger( "open", event, { tooltip: tooltip } );
-	},
-
-	_registerCloseHandlers: function( event, target ) {
-		var events = {
-			keyup: function( event ) {
-				if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
-					var fakeEvent = $.Event( event );
-					fakeEvent.currentTarget = target[ 0 ];
-					this.close( fakeEvent, true );
-				}
-			}
-		};
-
-		// Only bind remove handler for delegated targets. Non-delegated
-		// tooltips will handle this in destroy.
-		if ( target[ 0 ] !== this.element[ 0 ] ) {
-			events.remove = function() {
-				this._removeTooltip( this._find( target ).tooltip );
-			};
-		}
-
-		if ( !event || event.type === "mouseover" ) {
-			events.mouseleave = "close";
-		}
-		if ( !event || event.type === "focusin" ) {
-			events.focusout = "close";
-		}
-		this._on( true, target, events );
-	},
-
-	close: function( event ) {
-		var tooltip,
-			that = this,
-			target = $( event ? event.currentTarget : this.element ),
-			tooltipData = this._find( target );
-
-		// The tooltip may already be closed
-		if ( !tooltipData ) {
-
-			// We set ui-tooltip-open immediately upon open (in open()), but only set the
-			// additional data once there's actually content to show (in _open()). So even if the
-			// tooltip doesn't have full data, we always remove ui-tooltip-open in case we're in
-			// the period between open() and _open().
-			target.removeData( "ui-tooltip-open" );
-			return;
-		}
-
-		tooltip = tooltipData.tooltip;
-
-		// Disabling closes the tooltip, so we need to track when we're closing
-		// to avoid an infinite loop in case the tooltip becomes disabled on close
-		if ( tooltipData.closing ) {
-			return;
-		}
-
-		// Clear the interval for delayed tracking tooltips
-		clearInterval( this.delayedShow );
-
-		// Only set title if we had one before (see comment in _open())
-		// If the title attribute has changed since open(), don't restore
-		if ( target.data( "ui-tooltip-title" ) && !target.attr( "title" ) ) {
-			target.attr( "title", target.data( "ui-tooltip-title" ) );
-		}
-
-		this._removeDescribedBy( target );
-
-		tooltipData.hiding = true;
-		tooltip.stop( true );
-		this._hide( tooltip, this.options.hide, function() {
-			that._removeTooltip( $( this ) );
-		} );
-
-		target.removeData( "ui-tooltip-open" );
-		this._off( target, "mouseleave focusout keyup" );
-
-		// Remove 'remove' binding only on delegated targets
-		if ( target[ 0 ] !== this.element[ 0 ] ) {
-			this._off( target, "remove" );
-		}
-		this._off( this.document, "mousemove" );
-
-		if ( event && event.type === "mouseleave" ) {
-			$.each( this.parents, function( id, parent ) {
-				$( parent.element ).attr( "title", parent.title );
-				delete that.parents[ id ];
-			} );
-		}
-
-		tooltipData.closing = true;
-		this._trigger( "close", event, { tooltip: tooltip } );
-		if ( !tooltipData.hiding ) {
-			tooltipData.closing = false;
-		}
-	},
-
-	_tooltip: function( element ) {
-		var tooltip = $( "<div>" ).attr( "role", "tooltip" ),
-			content = $( "<div>" ).appendTo( tooltip ),
-			id = tooltip.uniqueId().attr( "id" );
-
-		this._addClass( content, "ui-tooltip-content" );
-		this._addClass( tooltip, "ui-tooltip", "ui-widget ui-widget-content" );
-
-		tooltip.appendTo( this._appendTo( element ) );
-
-		return this.tooltips[ id ] = {
-			element: element,
-			tooltip: tooltip
-		};
-	},
-
-	_find: function( target ) {
-		var id = target.data( "ui-tooltip-id" );
-		return id ? this.tooltips[ id ] : null;
-	},
-
-	_removeTooltip: function( tooltip ) {
-		tooltip.remove();
-		delete this.tooltips[ tooltip.attr( "id" ) ];
-	},
-
-	_appendTo: function( target ) {
-		var element = target.closest( ".ui-front, dialog" );
-
-		if ( !element.length ) {
-			element = this.document[ 0 ].body;
-		}
-
-		return element;
-	},
-
-	_destroy: function() {
-		var that = this;
-
-		// Close open tooltips
-		$.each( this.tooltips, function( id, tooltipData ) {
-
-			// Delegate to close method to handle common cleanup
-			var event = $.Event( "blur" ),
-				element = tooltipData.element;
-			event.target = event.currentTarget = element[ 0 ];
-			that.close( event, true );
-
-			// Remove immediately; destroying an open tooltip doesn't use the
-			// hide animation
-			$( "#" + id ).remove();
-
-			// Restore the title
-			if ( element.data( "ui-tooltip-title" ) ) {
-
-				// If the title attribute has changed since open(), don't restore
-				if ( !element.attr( "title" ) ) {
-					element.attr( "title", element.data( "ui-tooltip-title" ) );
-				}
-				element.removeData( "ui-tooltip-title" );
-			}
-		} );
-		this.liveRegion.remove();
-	}
-} );
-
-// DEPRECATED
-// TODO: Switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
-
-	// Backcompat for tooltipClass option
-	$.widget( "ui.tooltip", $.ui.tooltip, {
-		options: {
-			tooltipClass: null
-		},
-		_tooltip: function() {
-			var tooltipData = this._superApply( arguments );
-			if ( this.options.tooltipClass ) {
-				tooltipData.tooltip.addClass( this.options.tooltipClass );
-			}
-			return tooltipData;
-		}
-	} );
-}
-
-var widgetsTooltip = $.ui.tooltip;
-
-
-
-
-}));
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.min.css b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.min.css
deleted file mode 100644
index 776e2595a..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*! jQuery UI - v1.12.1 - 2016-09-14
-* http://jqueryui.com
-* Includes: core.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, draggable.css, resizable.css, progressbar.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?bgShadowXPos=&bgOverlayXPos=&bgErrorXPos=&bgHighlightXPos=&bgContentXPos=&bgHeaderXPos=&bgActiveXPos=&bgHoverXPos=&bgDefaultXPos=&bgShadowYPos=&bgOverlayYPos=&bgErrorYPos=&bgHighlightYPos=&bgContentYPos=&bgHeaderYPos=&bgActiveYPos=&bgHoverYPos=&bgDefaultYPos=&bgShadowRepeat=&bgOverlayRepeat=&bgErrorRepeat=&bgHighlightRepeat=&bgContentRepeat=&bgHeaderRepeat=&bgActiveRepeat=&bgHoverRepeat=&bgDefaultRepeat=&iconsHover=url(%22images%2Fui-icons_555555_256x240.png%22)&iconsHighlight=url(%22images%2Fui-icons_777620_256x240.png%22)&iconsHeader=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsError=url(%22images%2Fui-icons_cc0000_256x240.png%22)&iconsDefault=url(%22images%2Fui-icons_777777_256x240.png%22)&iconsContent=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsActive=url(%22images%2Fui-icons_ffffff_256x240.png%22)&bgImgUrlShadow=&bgImgUrlOverlay=&bgImgUrlHover=&bgImgUrlHighlight=&bgImgUrlHeader=&bgImgUrlError=&bgImgUrlDefault=&bgImgUrlContent=&bgImgUrlActive=&opacityFilterShadow=Alpha(Opacity%3D30)&opacityFilterOverlay=Alpha(Opacity%3D30)&opacityShadowPerc=30&opacityOverlayPerc=30&iconColorHover=%23555555&iconColorHighlight=%23777620&iconColorHeader=%23444444&iconColorError=%23cc0000&iconColorDefault=%23777777&iconColorContent=%23444444&iconColorActive=%23ffffff&bgImgOpacityShadow=0&bgImgOpacityOverlay=0&bgImgOpacityError=95&bgImgOpacityHighlight=55&bgImgOpacityContent=75&bgImgOpacityHeader=75&bgImgOpacityActive=65&bgImgOpacityHover=75&bgImgOpacityDefault=75&bgTextureShadow=flat&bgTextureOverlay=flat&bgTextureError=flat&bgTextureHighlight=flat&bgTextureContent=flat&bgTextureHeader=flat&bgTextureActive=flat&bgTextureHover=flat&bgTextureDefault=flat&cornerRadius=3px&fwDefault=normal&ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&cornerRadiusShadow=8px&thicknessShadow=5px&offsetLeftShadow=0px&offsetTopShadow=0px&opacityShadow=.3&bgColorShadow=%23666666&opacityOverlay=.3&bgColorOverlay=%23aaaaaa&fcError=%235f3f3f&borderColorError=%23f1a899&bgColorError=%23fddfdf&fcHighlight=%23777620&borderColorHighlight=%23dad55e&bgColorHighlight=%23fffa90&fcContent=%23333333&borderColorContent=%23dddddd&bgColorContent=%23ffffff&fcHeader=%23333333&borderColorHeader=%23dddddd&bgColorHeader=%23e9e9e9&fcActive=%23ffffff&borderColorActive=%23003eff&bgColorActive=%23007fff&fcHover=%232b2b2b&borderColorHover=%23cccccc&bgColorHover=%23ededed&fcDefault=%23454545&borderColorDefault=%23c5c5c5&bgColorDefault=%23f6f6f6
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important;pointer-events:none}.ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin:2px 0 0 0;padding:.5em .5em .5em .7em;font-size:100%}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:0}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{margin:0;cursor:pointer;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-item-wrapper{position:relative;padding:3px 1em 3px .4em}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item-wrapper{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-button{padding:.4em 1em;display:inline-block;position:relative;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2em;box-sizing:border-box;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-button-icon-only{text-indent:0}.ui-button-icon-only .ui-icon{position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}.ui-button.ui-icon-notext .ui-icon{padding:0;width:2.1em;height:2.1em;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-icon-notext .ui-icon{width:auto;height:auto;text-indent:0;white-space:normal;padding:.4em 1em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-controlgroup{vertical-align:middle;display:inline-block}.ui-controlgroup > .ui-controlgroup-item{float:left;margin-left:0;margin-right:0}.ui-controlgroup > .ui-controlgroup-item:focus,.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus{z-index:9999}.ui-controlgroup-vertical > .ui-controlgroup-item{display:block;float:none;width:100%;margin-top:0;margin-bottom:0;text-align:left}.ui-controlgroup-vertical .ui-controlgroup-item{box-sizing:border-box}.ui-controlgroup .ui-controlgroup-label{padding:.4em 1em}.ui-controlgroup .ui-controlgroup-label span{font-size:80%}.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item{border-left:none}.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item{border-top:none}.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content{border-right:none}.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content{border-bottom:none}.ui-controlgroup-vertical .ui-spinner-input{width:75%;width:calc( 100% - 2.4em )}.ui-controlgroup-vertical .ui-spinner .ui-spinner-up{border-top-style:solid}.ui-checkboxradio-label .ui-icon-background{box-shadow:inset 1px 1px 1px #ccc;border-radius:.12em;border:none}.ui-checkboxradio-radio-label .ui-icon-background{width:16px;height:16px;border-radius:1em;overflow:visible;border:none}.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon{background-image:none;width:8px;height:8px;border-width:4px;border-style:solid}.ui-checkboxradio-disabled{pointer-events:none}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-datepicker .ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat;left:.5em;top:.3em}.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-n{height:2px;top:0}.ui-dialog .ui-resizable-e{width:2px;right:0}.ui-dialog .ui-resizable-s{height:2px;bottom:0}.ui-dialog .ui-resizable-w{width:2px;left:0}.ui-dialog .ui-resizable-se,.ui-dialog .ui-resizable-sw,.ui-dialog .ui-resizable-ne,.ui-dialog .ui-resizable-nw{width:7px;height:7px}.ui-dialog .ui-resizable-se{right:0;bottom:0}.ui-dialog .ui-resizable-sw{left:0;bottom:0}.ui-dialog .ui-resizable-ne{right:0;top:0}.ui-dialog .ui-resizable-nw{left:0;top:0}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");height:100%;filter:alpha(opacity=25);opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:bold;line-height:1.5;padding:2px 0.4em;margin:0.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-text{display:block;margin-right:20px;overflow:hidden;text-overflow:ellipsis}.ui-selectmenu-button.ui-button{text-align:left;white-space:nowrap;width:14em}.ui-selectmenu-icon.ui-icon{float:right;margin-top:0}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default;-ms-touch-action:none;touch-action:none}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:.222em 0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:2em}.ui-spinner-button{width:1.6em;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top-style:none;border-bottom-style:none;border-right-style:none}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget.ui-widget-content{border:1px solid #c5c5c5}.ui-widget-content{border:1px solid #ddd;background:#fff;color:#333}.ui-widget-content a{color:#333}.ui-widget-header{border:1px solid #ddd;background:#e9e9e9;color:#333;font-weight:bold}.ui-widget-header a{color:#333}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default,.ui-button,html .ui-button.ui-state-disabled:hover,html .ui-button.ui-state-disabled:active{border:1px solid #c5c5c5;background:#f6f6f6;font-weight:normal;color:#454545}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited,a.ui-button,a:link.ui-button,a:visited.ui-button,.ui-button{color:#454545;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus,.ui-button:hover,.ui-button:focus{border:1px solid #ccc;background:#ededed;font-weight:normal;color:#2b2b2b}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited,a.ui-button:hover,a.ui-button:focus{color:#2b2b2b;text-decoration:none}.ui-visual-focus{box-shadow:0 0 3px 1px rgb(94,158,214)}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active,a.ui-button:active,.ui-button:active,.ui-button.ui-state-active:hover{border:1px solid #003eff;background:#007fff;font-weight:normal;color:#fff}.ui-icon-background,.ui-state-active .ui-icon-background{border:#003eff;background-color:#fff}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#fff;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #dad55e;background:#fffa90;color:#777620}.ui-state-checked{border:1px solid #dad55e;background:#fffa90}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#777620}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #f1a899;background:#fddfdf;color:#5f3f3f}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#5f3f3f}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#5f3f3f}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon,.ui-button:hover .ui-icon,.ui-button:focus .ui-icon{background-image:url("images/ui-icons_555555_256x240.png")}.ui-state-active .ui-icon,.ui-button:active .ui-icon{background-image:url("images/ui-icons_ffffff_256x240.png")}.ui-state-highlight .ui-icon,.ui-button .ui-state-highlight.ui-icon{background-image:url("images/ui-icons_777620_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cc0000_256x240.png")}.ui-button .ui-icon{background-image:url("images/ui-icons_777777_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-caret-1-n{background-position:0 0}.ui-icon-caret-1-ne{background-position:-16px 0}.ui-icon-caret-1-e{background-position:-32px 0}.ui-icon-caret-1-se{background-position:-48px 0}.ui-icon-caret-1-s{background-position:-65px 0}.ui-icon-caret-1-sw{background-position:-80px 0}.ui-icon-caret-1-w{background-position:-96px 0}.ui-icon-caret-1-nw{background-position:-112px 0}.ui-icon-caret-2-n-s{background-position:-128px 0}.ui-icon-caret-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-65px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-65px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:1px -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:3px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:3px}.ui-widget-overlay{background:#aaa;opacity:.003;filter:Alpha(Opacity=.3)}.ui-widget-shadow{-webkit-box-shadow:0 0 5px #666;box-shadow:0 0 5px #666}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.min.js b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.min.js
deleted file mode 100644
index 25398a167..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.min.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*! jQuery UI - v1.12.1 - 2016-09-14
-* http://jqueryui.com
-* Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){function e(t){for(var e=t.css("visibility");"inherit"===e;)t=t.parent(),e=t.css("visibility");return"hidden"!==e}function i(t){for(var e,i;t.length&&t[0]!==document;){if(e=t.css("position"),("absolute"===e||"relative"===e||"fixed"===e)&&(i=parseInt(t.css("zIndex"),10),!isNaN(i)&&0!==i))return i;t=t.parent()}return 0}function s(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},t.extend(this._defaults,this.regional[""]),this.regional.en=t.extend(!0,{},this.regional[""]),this.regional["en-US"]=t.extend(!0,{},this.regional.en),this.dpDiv=n(t("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function n(e){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.on("mouseout",i,function(){t(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).removeClass("ui-datepicker-next-hover")}).on("mouseover",i,o)}function o(){t.datepicker._isDisabledDatepicker(m.inline?m.dpDiv.parent()[0]:m.input[0])||(t(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),t(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).addClass("ui-datepicker-next-hover"))}function a(e,i){t.extend(e,i);for(var s in i)null==i[s]&&(e[s]=i[s]);return e}function r(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.ui=t.ui||{},t.ui.version="1.12.1";var h=0,l=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},h=e.split(".")[0];e=e.split(".")[1];var l=h+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][l.toLowerCase()]=function(e){return!!t.data(e,l)},t[h]=t[h]||{},n=t[h][e],o=t[h][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:h,widgetName:e,widgetFullName:l}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var i,s,n=l.call(arguments,1),o=0,a=n.length;a>o;o++)for(i in n[o])s=n[o][i],n[o].hasOwnProperty(i)&&void 0!==s&&(e[i]=t.isPlainObject(s)?t.isPlainObject(e[i])?t.widget.extend({},e[i],s):t.widget.extend({},s):s);return e},t.widget.bridge=function(e,i){var s=i.prototype.widgetFullName||e;t.fn[e]=function(n){var o="string"==typeof n,a=l.call(arguments,1),r=this;return o?this.length||"instance"!==n?this.each(function(){var i,o=t.data(this,s);return"instance"===n?(r=o,!1):o?t.isFunction(o[n])&&"_"!==n.charAt(0)?(i=o[n].apply(o,a),i!==o&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+n+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+n+"'")}):r=void 0:(a.length&&(n=t.widget.extend.apply(null,[n].concat(a))),this.each(function(){var e=t.data(this,s);e?(e.option(n||{}),e._init&&e._init()):t.data(this,s,new i(n,this))})),r}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(e,i){i=t(i||this.defaultElement||this)[0],this.element=t(i),this.uuid=h++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},i!==this&&(t.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===i&&this.destroy()}}),this.document=t(i.style?i.ownerDocument:i.document||i),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+o.eventNamespace,c=h[2];c?n.on(l,c,r):i.on(l,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,h=/top|center|bottom/,l=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType,o=!s&&!n;return{element:i,isWindow:s,isDocument:n,offset:o?t(e).offset():{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:i.outerWidth(),height:i.outerHeight()}}},t.fn.position=function(n){if(!n||!n.of)return d.apply(this,arguments);n=t.extend({},n);var u,p,f,g,m,_,v=t(n.of),b=t.position.getWithinInfo(n.within),y=t.position.getScrollInfo(b),w=(n.collision||"flip").split(" "),k={};return _=s(v),v[0].preventDefault&&(n.at="left top"),p=_.width,f=_.height,g=_.offset,m=t.extend({},g),t.each(["my","at"],function(){var t,e,i=(n[this]||"").split(" ");1===i.length&&(i=r.test(i[0])?i.concat(["center"]):h.test(i[0])?["center"].concat(i):["center","center"]),i[0]=r.test(i[0])?i[0]:"center",i[1]=h.test(i[1])?i[1]:"center",t=l.exec(i[0]),e=l.exec(i[1]),k[this]=[t?t[0]:0,e?e[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===w.length&&(w[1]=w[0]),"right"===n.at[0]?m.left+=p:"center"===n.at[0]&&(m.left+=p/2),"bottom"===n.at[1]?m.top+=f:"center"===n.at[1]&&(m.top+=f/2),u=e(k.at,p,f),m.left+=u[0],m.top+=u[1],this.each(function(){var s,r,h=t(this),l=h.outerWidth(),c=h.outerHeight(),d=i(this,"marginLeft"),_=i(this,"marginTop"),x=l+d+i(this,"marginRight")+y.width,C=c+_+i(this,"marginBottom")+y.height,D=t.extend({},m),I=e(k.my,h.outerWidth(),h.outerHeight());"right"===n.my[0]?D.left-=l:"center"===n.my[0]&&(D.left-=l/2),"bottom"===n.my[1]?D.top-=c:"center"===n.my[1]&&(D.top-=c/2),D.left+=I[0],D.top+=I[1],s={marginLeft:d,marginTop:_},t.each(["left","top"],function(e,i){t.ui.position[w[e]]&&t.ui.position[w[e]][i](D,{targetWidth:p,targetHeight:f,elemWidth:l,elemHeight:c,collisionPosition:s,collisionWidth:x,collisionHeight:C,offset:[u[0]+I[0],u[1]+I[1]],my:n.my,at:n.at,within:b,elem:h})}),n.using&&(r=function(t){var e=g.left-D.left,i=e+p-l,s=g.top-D.top,r=s+f-c,u={target:{element:v,left:g.left,top:g.top,width:p,height:f},element:{element:h,left:D.left,top:D.top,width:l,height:c},horizontal:0>i?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};l>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),h.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-a-n;e.collisionWidth>a?h>0&&0>=l?(i=t.left+h+e.collisionWidth-a-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+a-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-a-n;e.collisionHeight>a?h>0&&0>=l?(i=t.top+h+e.collisionHeight-a-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+a-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-r-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-r-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-h,(i>0||u>a(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}});var c="ui-effects-",u="ui-effects-style",d="ui-effects-animated",p=t;t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(t,o){var a,r=o.re.exec(i),h=r&&o.parse(r),l=o.space||"rgba";return h?(a=s[l](h),s[c[l].cache]=a[c[l].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],l=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=l.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),l.fn=t.extend(l.prototype,{parse:function(n,a,r,h){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,h],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof l?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=l(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=l(t),n=s._space(),o=c[n],a=0===this.alpha()?l("transparent"):this,r=a[o.cache]||o.to(a._rgba),h=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],l=s[o],c=u[n.type]||{};null!==l&&(null===a?h[o]=l:(c.mod&&(l-a>c.mod/2?a+=c.mod:a-l>c.mod/2&&(a-=c.mod)),h[o]=i((l-a)*e+a,n)))}),this[n](h)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(e)._rgba;return l(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),h=Math.min(s,n,o),l=r-h,c=r+h,u=.5*c;return e=h===r?0:s===r?60*(n-o)/l+360:n===r?60*(o-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=u?l/c:l/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,h=n.to,c=n.from;l.fn[s]=function(s){if(h&&!this[a]&&(this[a]=h(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=l(c(d)),n[a]=d,n):l(d)},f(o,function(e,i){l.fn[e]||(l.fn[e]=function(n){var o,a=t.type(n),h="alpha"===e?this._hsla?"hsla":"rgba":s,l=this[h](),c=l[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=l(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(h){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=l(e.elem,i),e.end=l(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},l.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(p),function(){function e(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function i(e,i){var s,o,a={};for(s in i)o=i[s],e[s]!==o&&(n[s]||(t.fx.step[s]||!isNaN(parseFloat(o)))&&(a[s]=o));return a}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(p.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(n,o,a,r){var h=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",l=h.children?a.find("*").addBack():a;l=l.map(function(){var i=t(this);return{el:i,start:e(this)}}),o=function(){t.each(s,function(t,e){n[e]&&a[e+"Class"](n[e])})},o(),l=l.map(function(){return this.end=e(this.el[0]),this.diff=i(this.start,this.end),this}),a.attr("class",r),l=l.map(function(){var e=this,i=t.Deferred(),s=t.extend({},h,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,l.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),h.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(e){return function(i,s,n,o,a){return"boolean"==typeof s||void 0===s?n?t.effects.animateClass.call(this,s?{add:i}:{remove:i},n,o,a):e.apply(this,arguments):t.effects.animateClass.call(this,{toggle:i},s,n,o)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function e(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function i(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}function s(t,e){var i=e.outerWidth(),s=e.outerHeight(),n=/^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,o=n.exec(t)||["",0,i,s,0];return{top:parseFloat(o[1])||0,right:"auto"===o[2]?i:parseFloat(o[2]),bottom:"auto"===o[3]?s:parseFloat(o[3]),left:parseFloat(o[4])||0}}t.expr&&t.expr.filters&&t.expr.filters.animated&&(t.expr.filters.animated=function(e){return function(i){return!!t(i).data(d)||e(i)}}(t.expr.filters.animated)),t.uiBackCompat!==!1&&t.extend(t.effects,{save:function(t,e){for(var i=0,s=e.length;s>i;i++)null!==e[i]&&t.data(c+e[i],t[0].style[e[i]])},restore:function(t,e){for(var i,s=0,n=e.length;n>s;s++)null!==e[s]&&(i=t.data(c+e[s]),t.css(e[s],i))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).trigger("focus"),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).trigger("focus")),e}}),t.extend(t.effects,{version:"1.12.1",define:function(e,i,s){return s||(s=i,i="effect"),t.effects.effect[e]=s,t.effects.effect[e].mode=i,s},scaledDimensions:function(t,e,i){if(0===e)return{height:0,width:0,outerHeight:0,outerWidth:0};var s="horizontal"!==i?(e||100)/100:1,n="vertical"!==i?(e||100)/100:1;return{height:t.height()*n,width:t.width()*s,outerHeight:t.outerHeight()*n,outerWidth:t.outerWidth()*s}},clipToBox:function(t){return{width:t.clip.right-t.clip.left,height:t.clip.bottom-t.clip.top,left:t.clip.left,top:t.clip.top}},unshift:function(t,e,i){var s=t.queue();e>1&&s.splice.apply(s,[1,0].concat(s.splice(e,i))),t.dequeue()},saveStyle:function(t){t.data(u,t[0].style.cssText)},restoreStyle:function(t){t[0].style.cssText=t.data(u)||"",t.removeData(u)},mode:function(t,e){var i=t.is(":hidden");return"toggle"===e&&(e=i?"show":"hide"),(i?"hide"===e:"show"===e)&&(e="none"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createPlaceholder:function(e){var i,s=e.css("position"),n=e.position();return e.css({marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()),/^(static|relative)/.test(s)&&(s="absolute",i=t("<"+e[0].nodeName+">").insertAfter(e).css({display:/^(inline|ruby)/.test(e.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight"),"float":e.css("float")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).addClass("ui-effects-placeholder"),e.data(c+"placeholder",i)),e.css({position:s,left:n.left,top:n.top}),i},removePlaceholder:function(t){var e=c+"placeholder",i=t.data(e);i&&(i.remove(),t.removeData(e))},cleanUp:function(e){t.effects.restoreStyle(e),t.effects.removePlaceholder(e)},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function i(e){function i(){r.removeData(d),t.effects.cleanUp(r),"hide"===s.mode&&r.hide(),a()}function a(){t.isFunction(h)&&h.call(r[0]),t.isFunction(e)&&e()}var r=t(this);s.mode=c.shift(),t.uiBackCompat===!1||o?"none"===s.mode?(r[l](),a()):n.call(r[0],s,i):(r.is(":hidden")?"hide"===l:"show"===l)?(r[l](),a()):n.call(r[0],s,a)}var s=e.apply(this,arguments),n=t.effects.effect[s.effect],o=n.mode,a=s.queue,r=a||"fx",h=s.complete,l=s.mode,c=[],u=function(e){var i=t(this),s=t.effects.mode(i,l)||o;i.data(d,!0),c.push(s),o&&("show"===s||s===o&&"hide"===s)&&i.show(),o&&"none"===s||t.effects.saveStyle(i),t.isFunction(e)&&e()};return t.fx.off||!n?l?this[l](s.duration,h):this.each(function(){h&&h.call(this)}):a===!1?this.each(u).each(i):this.queue(r,u).queue(r,i)},show:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="show",this.effect.call(this,n)
-}}(t.fn.show),hide:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(t.fn.hide),toggle:function(t){return function(s){if(i(s)||"boolean"==typeof s)return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s},cssClip:function(t){return t?this.css("clip","rect("+t.top+"px "+t.right+"px "+t.bottom+"px "+t.left+"px)"):s(this.css("clip"),this)},transfer:function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,h=o?a.scrollLeft():0,l=n.offset(),c={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("<div class='ui-effects-transfer'></div>").appendTo("body").addClass(e.className).css({top:u.top-r,left:u.left-h,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),t.isFunction(i)&&i()})}}),t.fx.step.clip=function(e){e.clipInit||(e.start=t(e.elem).cssClip(),"string"==typeof e.end&&(e.end=s(e.end,e.elem)),e.clipInit=!0),t(e.elem).cssClip({top:e.pos*(e.end.top-e.start.top)+e.start.top,right:e.pos*(e.end.right-e.start.right)+e.start.right,bottom:e.pos*(e.end.bottom-e.start.bottom)+e.start.bottom,left:e.pos*(e.end.left-e.start.left)+e.start.left})}}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}();var f=t.effects;t.effects.define("blind","hide",function(e,i){var s={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},n=t(this),o=e.direction||"up",a=n.cssClip(),r={clip:t.extend({},a)},h=t.effects.createPlaceholder(n);r.clip[s[o][0]]=r.clip[s[o][1]],"show"===e.mode&&(n.cssClip(r.clip),h&&h.css(t.effects.clipToBox(r)),r.clip=a),h&&h.animate(t.effects.clipToBox(r),e.duration,e.easing),n.animate(r,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("bounce",function(e,i){var s,n,o,a=t(this),r=e.mode,h="hide"===r,l="show"===r,c=e.direction||"up",u=e.distance,d=e.times||5,p=2*d+(l||h?1:0),f=e.duration/p,g=e.easing,m="up"===c||"down"===c?"top":"left",_="up"===c||"left"===c,v=0,b=a.queue().length;for(t.effects.createPlaceholder(a),o=a.css(m),u||(u=a["top"===m?"outerHeight":"outerWidth"]()/3),l&&(n={opacity:1},n[m]=o,a.css("opacity",0).css(m,_?2*-u:2*u).animate(n,f,g)),h&&(u/=Math.pow(2,d-1)),n={},n[m]=o;d>v;v++)s={},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g).animate(n,f,g),u=h?2*u:u/2;h&&(s={opacity:0},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g)),a.queue(i),t.effects.unshift(a,b,p+1)}),t.effects.define("clip","hide",function(e,i){var s,n={},o=t(this),a=e.direction||"vertical",r="both"===a,h=r||"horizontal"===a,l=r||"vertical"===a;s=o.cssClip(),n.clip={top:l?(s.bottom-s.top)/2:s.top,right:h?(s.right-s.left)/2:s.right,bottom:l?(s.bottom-s.top)/2:s.bottom,left:h?(s.right-s.left)/2:s.left},t.effects.createPlaceholder(o),"show"===e.mode&&(o.cssClip(n.clip),n.clip=s),o.animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("drop","hide",function(e,i){var s,n=t(this),o=e.mode,a="show"===o,r=e.direction||"left",h="up"===r||"down"===r?"top":"left",l="up"===r||"left"===r?"-=":"+=",c="+="===l?"-=":"+=",u={opacity:0};t.effects.createPlaceholder(n),s=e.distance||n["top"===h?"outerHeight":"outerWidth"](!0)/2,u[h]=l+s,a&&(n.css(u),u[h]=c+s,u.opacity=1),n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("explode","hide",function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),i()}var o,a,r,h,l,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=e.mode,g="show"===f,m=p.show().css("visibility","hidden").offset(),_=Math.ceil(p.outerWidth()/d),v=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(h=m.top+o*v,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*_,l=a-(d-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-a*_,top:-o*v}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:_,height:v,left:r+(g?l*_:0),top:h+(g?c*v:0),opacity:g?0:1}).animate({left:r+(g?0:l*_),top:h+(g?0:c*v),opacity:g?1:0},e.duration||500,e.easing,s)}),t.effects.define("fade","toggle",function(e,i){var s="show"===e.mode;t(this).css("opacity",s?0:1).animate({opacity:s?1:0},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("fold","hide",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=e.size||15,h=/([0-9]+)%/.exec(r),l=!!e.horizFirst,c=l?["right","bottom"]:["bottom","right"],u=e.duration/2,d=t.effects.createPlaceholder(s),p=s.cssClip(),f={clip:t.extend({},p)},g={clip:t.extend({},p)},m=[p[c[0]],p[c[1]]],_=s.queue().length;h&&(r=parseInt(h[1],10)/100*m[a?0:1]),f.clip[c[0]]=r,g.clip[c[0]]=r,g.clip[c[1]]=0,o&&(s.cssClip(g.clip),d&&d.css(t.effects.clipToBox(g)),g.clip=p),s.queue(function(i){d&&d.animate(t.effects.clipToBox(f),u,e.easing).animate(t.effects.clipToBox(g),u,e.easing),i()}).animate(f,u,e.easing).animate(g,u,e.easing).queue(i),t.effects.unshift(s,_,4)}),t.effects.define("highlight","show",function(e,i){var s=t(this),n={backgroundColor:s.css("backgroundColor")};"hide"===e.mode&&(n.opacity=0),t.effects.saveStyle(s),s.css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("size",function(e,i){var s,n,o,a=t(this),r=["fontSize"],h=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],l=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],c=e.mode,u="effect"!==c,d=e.scale||"both",p=e.origin||["middle","center"],f=a.css("position"),g=a.position(),m=t.effects.scaledDimensions(a),_=e.from||m,v=e.to||t.effects.scaledDimensions(a,0);t.effects.createPlaceholder(a),"show"===c&&(o=_,_=v,v=o),n={from:{y:_.height/m.height,x:_.width/m.width},to:{y:v.height/m.height,x:v.width/m.width}},("box"===d||"both"===d)&&(n.from.y!==n.to.y&&(_=t.effects.setTransition(a,h,n.from.y,_),v=t.effects.setTransition(a,h,n.to.y,v)),n.from.x!==n.to.x&&(_=t.effects.setTransition(a,l,n.from.x,_),v=t.effects.setTransition(a,l,n.to.x,v))),("content"===d||"both"===d)&&n.from.y!==n.to.y&&(_=t.effects.setTransition(a,r,n.from.y,_),v=t.effects.setTransition(a,r,n.to.y,v)),p&&(s=t.effects.getBaseline(p,m),_.top=(m.outerHeight-_.outerHeight)*s.y+g.top,_.left=(m.outerWidth-_.outerWidth)*s.x+g.left,v.top=(m.outerHeight-v.outerHeight)*s.y+g.top,v.left=(m.outerWidth-v.outerWidth)*s.x+g.left),a.css(_),("content"===d||"both"===d)&&(h=h.concat(["marginTop","marginBottom"]).concat(r),l=l.concat(["marginLeft","marginRight"]),a.find("*[width]").each(function(){var i=t(this),s=t.effects.scaledDimensions(i),o={height:s.height*n.from.y,width:s.width*n.from.x,outerHeight:s.outerHeight*n.from.y,outerWidth:s.outerWidth*n.from.x},a={height:s.height*n.to.y,width:s.width*n.to.x,outerHeight:s.height*n.to.y,outerWidth:s.width*n.to.x};n.from.y!==n.to.y&&(o=t.effects.setTransition(i,h,n.from.y,o),a=t.effects.setTransition(i,h,n.to.y,a)),n.from.x!==n.to.x&&(o=t.effects.setTransition(i,l,n.from.x,o),a=t.effects.setTransition(i,l,n.to.x,a)),u&&t.effects.saveStyle(i),i.css(o),i.animate(a,e.duration,e.easing,function(){u&&t.effects.restoreStyle(i)})})),a.animate(v,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){var e=a.offset();0===v.opacity&&a.css("opacity",_.opacity),u||(a.css("position","static"===f?"relative":f).offset(e),t.effects.saveStyle(a)),i()}})}),t.effects.define("scale",function(e,i){var s=t(this),n=e.mode,o=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"effect"!==n?0:100),a=t.extend(!0,{from:t.effects.scaledDimensions(s),to:t.effects.scaledDimensions(s,o,e.direction||"both"),origin:e.origin||["middle","center"]},e);e.fade&&(a.from.opacity=1,a.to.opacity=0),t.effects.effect.size.call(this,a,i)}),t.effects.define("puff","hide",function(e,i){var s=t.extend(!0,{},e,{fade:!0,percent:parseInt(e.percent,10)||150});t.effects.effect.scale.call(this,s,i)}),t.effects.define("pulsate","show",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=o||a,h=2*(e.times||5)+(r?1:0),l=e.duration/h,c=0,u=1,d=s.queue().length;for((o||!s.is(":visible"))&&(s.css("opacity",0).show(),c=1);h>u;u++)s.animate({opacity:c},l,e.easing),c=1-c;s.animate({opacity:c},l,e.easing),s.queue(i),t.effects.unshift(s,d,h+1)}),t.effects.define("shake",function(e,i){var s=1,n=t(this),o=e.direction||"left",a=e.distance||20,r=e.times||3,h=2*r+1,l=Math.round(e.duration/h),c="up"===o||"down"===o?"top":"left",u="up"===o||"left"===o,d={},p={},f={},g=n.queue().length;for(t.effects.createPlaceholder(n),d[c]=(u?"-=":"+=")+a,p[c]=(u?"+=":"-=")+2*a,f[c]=(u?"-=":"+=")+2*a,n.animate(d,l,e.easing);r>s;s++)n.animate(p,l,e.easing).animate(f,l,e.easing);n.animate(p,l,e.easing).animate(d,l/2,e.easing).queue(i),t.effects.unshift(n,g,h+1)}),t.effects.define("slide","show",function(e,i){var s,n,o=t(this),a={up:["bottom","top"],down:["top","bottom"],left:["right","left"],right:["left","right"]},r=e.mode,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h,u=e.distance||o["top"===l?"outerHeight":"outerWidth"](!0),d={};t.effects.createPlaceholder(o),s=o.cssClip(),n=o.position()[l],d[l]=(c?-1:1)*u+n,d.clip=o.cssClip(),d.clip[a[h][1]]=d.clip[a[h][0]],"show"===r&&(o.cssClip(d.clip),o.css(l,d[l]),d.clip=s,d[l]=n),o.animate(d,{queue:!1,duration:e.duration,easing:e.easing,complete:i})});var f;t.uiBackCompat!==!1&&(f=t.effects.define("transfer",function(e,i){t(this).transfer(e,i)})),t.ui.focusable=function(i,s){var n,o,a,r,h,l=i.nodeName.toLowerCase();return"area"===l?(n=i.parentNode,o=n.name,i.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap='#"+o+"']"),a.length>0&&a.is(":visible")):!1):(/^(input|select|textarea|button|object)$/.test(l)?(r=!i.disabled,r&&(h=t(i).closest("fieldset")[0],h&&(r=!h.disabled))):r="a"===l?i.href||s:s,r&&t(i).is(":visible")&&e(t(i)))},t.extend(t.expr[":"],{focusable:function(e){return t.ui.focusable(e,null!=t.attr(e,"tabindex"))}}),t.ui.focusable,t.fn.form=function(){return"string"==typeof this[0].form?this.closest("form"):t(this[0].form)},t.ui.formResetMixin={_formResetHandler:function(){var e=t(this);setTimeout(function(){var i=e.data("ui-form-reset-instances");t.each(i,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element.form(),this.form.length){var t=this.form.data("ui-form-reset-instances")||[];t.length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t)}},_unbindFormResetHandler:function(){if(this.form.length){var e=this.form.data("ui-form-reset-instances");e.splice(t.inArray(this,e),1),e.length?this.form.data("ui-form-reset-instances",e):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}},"1.7"===t.fn.jquery.substring(0,3)&&(t.each(["Width","Height"],function(e,i){function s(e,i,s,o){return t.each(n,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),o&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],o=i.toLowerCase(),a={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(e){return void 0===e?a["inner"+i].call(this):this.each(function(){t(this).css(o,s(this,e)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?a["outer"+i].call(this,e):this.each(function(){t(this).css(o,s(this,e,!0,n)+"px")})}}),t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.ui.escapeSelector=function(){var t=/([!"#$%&'()*+,.\/:;<=>?@[\]^`{|}~])/g;return function(e){return e.replace(t,"\\$1")}}(),t.fn.labels=function(){var e,i,s,n,o;return this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(n=this.eq(0).parents("label"),s=this.attr("id"),s&&(e=this.eq(0).parents().last(),o=e.add(e.length?e.siblings():this.siblings()),i="label[for='"+t.ui.escapeSelector(s)+"']",n=n.add(o.find(i).addBack(i))),this.pushStack(n))},t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.extend(t.expr[":"],{tabbable:function(e){var i=t.attr(e,"tabindex"),s=null!=i;return(!s||i>=0)&&t.ui.focusable(e,s)}}),t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.widget("ui.accordion",{version:"1.12.1",options:{active:0,animate:{},classes:{"ui-accordion-header":"ui-corner-top","ui-accordion-header-collapsed":"ui-corner-all","ui-accordion-content":"ui-corner-bottom"},collapsible:!1,event:"click",header:"> li > :first-child, > :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t()}},_createIcons:function(){var e,i,s=this.options.icons;s&&(e=t("<span>"),this._addClass(e,"ui-accordion-header-icon","ui-icon "+s.header),e.prependTo(this.headers),i=this.active.children(".ui-accordion-header-icon"),this._removeClass(i,s.header)._addClass(i,null,s.activeHeader)._addClass(this.headers,"ui-accordion-icons"))},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),void 0)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!t)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),t(o).trigger("focus"),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().trigger("focus")},refresh:function(){var e=this.options;this._processPanels(),e.active===!1&&e.collapsible===!0||!this.headers.length?(e.active=!1,this.active=t()):e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var t=this.headers,e=this.panels;this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),e&&(this._off(t.not(this.headers)),this._off(e.not(this.panels)))},_refresh:function(){var e,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var e=t(this),i=e.uniqueId().attr("id"),s=e.next(),n=s.uniqueId().attr("id");e.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(e=n.height(),this.element.siblings(":visible").each(function(){var i=t(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(e-=i.outerHeight(!0))}),this.headers.each(function(){e-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,e-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===s&&(e=0,this.headers.next().each(function(){var i=t(this).is(":visible");i||t(this).show(),e=Math.max(e,t(this).css("height","").height()),i||t(this).hide()}).height(e))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i,s,n=this.options,o=this.active,a=t(e.currentTarget),r=a[0]===o[0],h=r&&n.collapsible,l=h?t():a.next(),c=o.next(),u={oldHeader:o,oldPanel:c,newHeader:h?t():a,newPanel:l};e.preventDefault(),r&&!n.collapsible||this._trigger("beforeActivate",e,u)===!1||(n.active=h?!1:this.headers.index(a),this.active=r?t():a,this._toggle(u),this._removeClass(o,"ui-accordion-header-active","ui-state-active"),n.icons&&(i=o.children(".ui-accordion-header-icon"),this._removeClass(i,null,n.icons.activeHeader)._addClass(i,null,n.icons.header)),r||(this._removeClass(a,"ui-accordion-header-collapsed")._addClass(a,"ui-accordion-header-active","ui-state-active"),n.icons&&(s=a.children(".ui-accordion-header-icon"),this._removeClass(s,null,n.icons.header)._addClass(s,null,n.icons.activeHeader)),this._addClass(a.next(),"ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(t(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(t,e,i){var s,n,o,a=this,r=0,h=t.css("box-sizing"),l=t.length&&(!e.length||t.index()<e.index()),c=this.options.animate||{},u=l&&c.down||c,d=function(){a._toggleComplete(i)};return"number"==typeof u&&(o=u),"string"==typeof u&&(n=u),n=n||u.easing||c.easing,o=o||u.duration||c.duration,e.length?t.length?(s=t.show().outerHeight(),e.animate(this.hideProps,{duration:o,easing:n,step:function(t,e){e.now=Math.round(t)}}),t.hide().animate(this.showProps,{duration:o,easing:n,complete:d,step:function(t,i){i.now=Math.round(t),"height"!==i.prop?"content-box"===h&&(r+=i.now):"content"!==a.options.heightStyle&&(i.now=Math.round(s-e.outerHeight()-r),r=0)}}),void 0):e.animate(this.hideProps,o,n,d):t.animate(this.showProps,o,n,d)},_toggleComplete:function(t){var e=t.oldPanel,i=e.prev();this._removeClass(e,"ui-accordion-content-active"),this._removeClass(i,"ui-accordion-header-active")._addClass(i,"ui-accordion-header-collapsed"),e.length&&(e.parent()[0].className=e.parent()[0].className),this._trigger("activate",null,t)}}),t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.widget("ui.menu",{version:"1.12.1",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault()},"click .ui-menu-item":function(e){var i=t(e.target),s=t(t.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&s.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){if(!this.previousFilter){var i=t(e.target).closest(".ui-menu-item"),s=t(e.currentTarget);i[0]===s[0]&&(this._removeClass(s.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(e,s))}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.find(this.options.items).eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){var i=!t.contains(this.element[0],t.ui.safeActiveElement(this.document[0]));i&&this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t),this.mouseHandled=!1}})},_destroy:function(){var e=this.element.find(".ui-menu-item").removeAttr("role aria-disabled"),i=e.children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),i.children().each(function(){var e=t(this);e.data("ui-menu-submenu-caret")&&e.remove()})},_keydown:function(e){var i,s,n,o,a=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:a=!1,s=this.previousFilter||"",o=!1,n=e.keyCode>=96&&105>=e.keyCode?""+(e.keyCode-96):String.fromCharCode(e.keyCode),clearTimeout(this.filterTimer),n===s?o=!0:n=s+n,i=this._filterMenuItems(n),i=o&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(e.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(e,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}a&&e.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i,s,n,o,a=this,r=this.options.icons.submenu,h=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),s=h.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),i=e.prev(),s=t("<span>").data("ui-menu-submenu-caret",!0);a._addClass(s,"ui-menu-icon","ui-icon "+r),i.attr("aria-haspopup","true").prepend(s),e.attr("aria-labelledby",i.attr("id"))}),this._addClass(s,"ui-menu","ui-widget ui-widget-content ui-front"),e=h.add(this.element),i=e.find(this.options.items),i.not(".ui-menu-item").each(function(){var e=t(this);a._isDivider(e)&&a._addClass(e,"ui-menu-divider","ui-widget-content")}),n=i.not(".ui-menu-item, .ui-menu-divider"),o=n.children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(n,"ui-menu-item")._addClass(o,"ui-menu-item-wrapper"),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){if("icons"===t){var i=this.element.find(".ui-menu-icon");this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)}this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t+""),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i,s,n;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children(".ui-menu-item-wrapper"),this._addClass(s,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),n=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(n,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.outerHeight(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this._removeClass(s.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(e){return!t(e.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(e),void 0)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items).first())),void 0):(this.next(e),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)},_filterMenuItems:function(e){var i=e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(t.trim(t(this).children(".ui-menu-item-wrapper").text()))})}}),t.widget("ui.autocomplete",{version:"1.12.1",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;
-this.isMultiLine=o||!a&&this._isContentEditable(this.element),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,void 0;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),void 0):(this._searchTimeout(t),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(t),this._change(t),void 0)}}),this._initSource(),this.menu=t("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,this.element[0]!==t.ui.safeActiveElement(this.document[0])&&this.element.trigger("focus")})},menufocus:function(e,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",e,{item:n})&&e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&t.trim(s).length&&(this.liveRegion.children().hide(),t("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,i){var s=i.item.data("ui-autocomplete-item"),n=this.previous;this.element[0]!==t.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=n,this._delay(function(){this.previous=n,this.selectedItem=s})),!1!==this._trigger("select",e,{item:s})&&this._value(s.value),this.term=this._value(),this.close(e),this.selectedItem=s}}),this.liveRegion=t("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(e){var i=this.menu.element[0];return e.target===this.element[0]||e.target===i||t.contains(i,e.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){var e=this.term===this._value(),i=this.menu.element.is(":visible"),s=t.altKey||t.ctrlKey||t.metaKey||t.shiftKey;(!e||e&&!i&&!s)&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):this._trigger("search",e)!==!1?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return t.proxy(function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")},this)},__response:function(t){t&&(t=this._normalize(t)),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(e){return e.length&&e[0].label&&e[0].value?e:t.map(e,function(e){return"string"==typeof e?{label:e,value:e}:t.extend({},e,{label:e.label||e.value,value:e.value||e.label})})},_suggest:function(e){var i=this.menu.element.empty();this._renderMenu(i,e),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(t.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(e,i){var s=this;t.each(i,function(t,i){s._renderItemData(e,i)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(e,i){return t("<li>").append(t("<div>").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[t](e),void 0):(this.search(null,e),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=e&&e.length?this.options.messages.results(e.length):this.options.messages.noResults,this.liveRegion.children().hide(),t("<div>").text(i).appendTo(this.liveRegion))}}),t.ui.autocomplete;var g=/ui-corner-([a-z]){2,6}/g;t.widget("ui.controlgroup",{version:"1.12.1",defaultElement:"<div>",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var e=this,i=[];t.each(this.options.items,function(s,n){var o,a={};return n?"controlgroupLabel"===s?(o=e.element.find(n),o.each(function(){var e=t(this);e.children(".ui-controlgroup-label-contents").length||e.contents().wrapAll("<span class='ui-controlgroup-label-contents'></span>")}),e._addClass(o,null,"ui-widget ui-widget-content ui-state-default"),i=i.concat(o.get()),void 0):(t.fn[s]&&(a=e["_"+s+"Options"]?e["_"+s+"Options"]("middle"):{classes:{}},e.element.find(n).each(function(){var n=t(this),o=n[s]("instance"),r=t.widget.extend({},a);if("button"!==s||!n.parent(".ui-spinner").length){o||(o=n[s]()[s]("instance")),o&&(r.classes=e._resolveClassesValues(r.classes,o)),n[s](r);var h=n[s]("widget");t.data(h[0],"ui-controlgroup-data",o?o:n[s]("instance")),i.push(h[0])}})),void 0):void 0}),this.childWidgets=t(t.unique(i)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(e){this.childWidgets.each(function(){var i=t(this),s=i.data("ui-controlgroup-data");s&&s[e]&&s[e]()})},_updateCornerClass:function(t,e){var i="ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all",s=this._buildSimpleOptions(e,"label").classes.label;this._removeClass(t,null,i),this._addClass(t,null,s)},_buildSimpleOptions:function(t,e){var i="vertical"===this.options.direction,s={classes:{}};return s.classes[e]={middle:"",first:"ui-corner-"+(i?"top":"left"),last:"ui-corner-"+(i?"bottom":"right"),only:"ui-corner-all"}[t],s},_spinnerOptions:function(t){var e=this._buildSimpleOptions(t,"ui-spinner");return e.classes["ui-spinner-up"]="",e.classes["ui-spinner-down"]="",e},_buttonOptions:function(t){return this._buildSimpleOptions(t,"ui-button")},_checkboxradioOptions:function(t){return this._buildSimpleOptions(t,"ui-checkboxradio-label")},_selectmenuOptions:function(t){var e="vertical"===this.options.direction;return{width:e?"auto":!1,classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(e?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(e?"top":"left")},last:{"ui-selectmenu-button-open":e?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(e?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[t]}},_resolveClassesValues:function(e,i){var s={};return t.each(e,function(n){var o=i.options.classes[n]||"";o=t.trim(o.replace(g,"")),s[n]=(o+" "+e[n]).replace(/\s+/g," ")}),s},_setOption:function(t,e){return"direction"===t&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(t,e),"disabled"===t?(this._callChildMethod(e?"disable":"enable"),void 0):(this.refresh(),void 0)},refresh:function(){var e,i=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),"horizontal"===this.options.direction&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),e=this.childWidgets,this.options.onlyVisible&&(e=e.filter(":visible")),e.length&&(t.each(["first","last"],function(t,s){var n=e[s]().data("ui-controlgroup-data");if(n&&i["_"+n.widgetName+"Options"]){var o=i["_"+n.widgetName+"Options"](1===e.length?"only":s);o.classes=i._resolveClassesValues(o.classes,n),n.element[n.widgetName](o)}else i._updateCornerClass(e[s](),s)}),this._callChildMethod("refresh"))}}),t.widget("ui.checkboxradio",[t.ui.formResetMixin,{version:"1.12.1",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var e,i,s=this,n=this._super()||{};return this._readType(),i=this.element.labels(),this.label=t(i[i.length-1]),this.label.length||t.error("No label found for checkboxradio widget"),this.originalLabel="",this.label.contents().not(this.element[0]).each(function(){s.originalLabel+=3===this.nodeType?t(this).text():this.outerHTML}),this.originalLabel&&(n.label=this.originalLabel),e=this.element[0].disabled,null!=e&&(n.disabled=e),n},_create:function(){var t=this.element[0].checked;this._bindFormResetHandler(),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),"radio"===this.type&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),t&&(this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this.icon&&this._addClass(this.icon,null,"ui-state-hover")),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var e=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,"input"===e&&/radio|checkbox/.test(this.type)||t.error("Can't create checkboxradio on element.nodeName="+e+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var e,i=this.element[0].name,s="input[name='"+t.ui.escapeSelector(i)+"']";return i?(e=this.form.length?t(this.form[0].elements).filter(s):t(s).filter(function(){return 0===t(this).form().length}),e.not(this.element)):t([])},_toggleClasses:function(){var e=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",e),this.options.icon&&"checkbox"===this.type&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",e)._toggleClass(this.icon,null,"ui-icon-blank",!e),"radio"===this.type&&this._getRadioGroup().each(function(){var e=t(this).checkboxradio("instance");e&&e._removeClass(e.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(t,e){return"label"!==t||e?(this._super(t,e),"disabled"===t?(this._toggleClass(this.label,null,"ui-state-disabled",e),this.element[0].disabled=e,void 0):(this.refresh(),void 0)):void 0},_updateIcon:function(e){var i="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=t("<span>"),this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),"checkbox"===this.type?(i+=e?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,e?"ui-icon-blank":"ui-icon-check")):i+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",i),e||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):void 0!==this.icon&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)},_updateLabel:function(){var t=this.label.contents().not(this.element[0]);this.icon&&(t=t.not(this.icon[0])),this.iconSpace&&(t=t.not(this.iconSpace[0])),t.remove(),this.label.append(this.options.label)},refresh:function(){var t=this.element[0].checked,e=this.element[0].disabled;this._updateIcon(t),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),null!==this.options.label&&this._updateLabel(),e!==this.options.disabled&&this._setOptions({disabled:e})}}]),t.ui.checkboxradio,t.widget("ui.button",{version:"1.12.1",defaultElement:"<button>",options:{classes:{"ui-button":"ui-corner-all"},disabled:null,icon:null,iconPosition:"beginning",label:null,showLabel:!0},_getCreateOptions:function(){var t,e=this._super()||{};return this.isInput=this.element.is("input"),t=this.element[0].disabled,null!=t&&(e.disabled=t),this.originalLabel=this.isInput?this.element.val():this.element.html(),this.originalLabel&&(e.label=this.originalLabel),e},_create:function(){!this.option.showLabel&!this.options.icon&&(this.options.showLabel=!0),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled||!1),this.hasTitle=!!this.element.attr("title"),this.options.label&&this.options.label!==this.originalLabel&&(this.isInput?this.element.val(this.options.label):this.element.html(this.options.label)),this._addClass("ui-button","ui-widget"),this._setOption("disabled",this.options.disabled),this._enhance(),this.element.is("a")&&this._on({keyup:function(e){e.keyCode===t.ui.keyCode.SPACE&&(e.preventDefault(),this.element[0].click?this.element[0].click():this.element.trigger("click"))}})},_enhance:function(){this.element.is("button")||this.element.attr("role","button"),this.options.icon&&(this._updateIcon("icon",this.options.icon),this._updateTooltip())},_updateTooltip:function(){this.title=this.element.attr("title"),this.options.showLabel||this.title||this.element.attr("title",this.options.label)},_updateIcon:function(e,i){var s="iconPosition"!==e,n=s?this.options.iconPosition:i,o="top"===n||"bottom"===n;this.icon?s&&this._removeClass(this.icon,null,this.options.icon):(this.icon=t("<span>"),this._addClass(this.icon,"ui-button-icon","ui-icon"),this.options.showLabel||this._addClass("ui-button-icon-only")),s&&this._addClass(this.icon,null,i),this._attachIcon(n),o?(this._addClass(this.icon,null,"ui-widget-icon-block"),this.iconSpace&&this.iconSpace.remove()):(this.iconSpace||(this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-button-icon-space")),this._removeClass(this.icon,null,"ui-wiget-icon-block"),this._attachIconSpace(n))},_destroy:function(){this.element.removeAttr("role"),this.icon&&this.icon.remove(),this.iconSpace&&this.iconSpace.remove(),this.hasTitle||this.element.removeAttr("title")},_attachIconSpace:function(t){this.icon[/^(?:end|bottom)/.test(t)?"before":"after"](this.iconSpace)},_attachIcon:function(t){this.element[/^(?:end|bottom)/.test(t)?"append":"prepend"](this.icon)},_setOptions:function(t){var e=void 0===t.showLabel?this.options.showLabel:t.showLabel,i=void 0===t.icon?this.options.icon:t.icon;e||i||(t.showLabel=!0),this._super(t)},_setOption:function(t,e){"icon"===t&&(e?this._updateIcon(t,e):this.icon&&(this.icon.remove(),this.iconSpace&&this.iconSpace.remove())),"iconPosition"===t&&this._updateIcon(t,e),"showLabel"===t&&(this._toggleClass("ui-button-icon-only",null,!e),this._updateTooltip()),"label"===t&&(this.isInput?this.element.val(e):(this.element.html(e),this.icon&&(this._attachIcon(this.options.iconPosition),this._attachIconSpace(this.options.iconPosition)))),this._super(t,e),"disabled"===t&&(this._toggleClass(null,"ui-state-disabled",e),this.element[0].disabled=e,e&&this.element.blur())},refresh:function(){var t=this.element.is("input, button")?this.element[0].disabled:this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOptions({disabled:t}),this._updateTooltip()}}),t.uiBackCompat!==!1&&(t.widget("ui.button",t.ui.button,{options:{text:!0,icons:{primary:null,secondary:null}},_create:function(){this.options.showLabel&&!this.options.text&&(this.options.showLabel=this.options.text),!this.options.showLabel&&this.options.text&&(this.options.text=this.options.showLabel),this.options.icon||!this.options.icons.primary&&!this.options.icons.secondary?this.options.icon&&(this.options.icons.primary=this.options.icon):this.options.icons.primary?this.options.icon=this.options.icons.primary:(this.options.icon=this.options.icons.secondary,this.options.iconPosition="end"),this._super()},_setOption:function(t,e){return"text"===t?(this._super("showLabel",e),void 0):("showLabel"===t&&(this.options.text=e),"icon"===t&&(this.options.icons.primary=e),"icons"===t&&(e.primary?(this._super("icon",e.primary),this._super("iconPosition","beginning")):e.secondary&&(this._super("icon",e.secondary),this._super("iconPosition","end"))),this._superApply(arguments),void 0)}}),t.fn.button=function(e){return function(){return!this.length||this.length&&"INPUT"!==this[0].tagName||this.length&&"INPUT"===this[0].tagName&&"checkbox"!==this.attr("type")&&"radio"!==this.attr("type")?e.apply(this,arguments):(t.ui.checkboxradio||t.error("Checkboxradio widget missing"),0===arguments.length?this.checkboxradio({icon:!1}):this.checkboxradio.apply(this,arguments))}}(t.fn.button),t.fn.buttonset=function(){return t.ui.controlgroup||t.error("Controlgroup widget missing"),"option"===arguments[0]&&"items"===arguments[1]&&arguments[2]?this.controlgroup.apply(this,[arguments[0],"items.button",arguments[2]]):"option"===arguments[0]&&"items"===arguments[1]?this.controlgroup.apply(this,[arguments[0],"items.button"]):("object"==typeof arguments[0]&&arguments[0].items&&(arguments[0].items={button:arguments[0].items}),this.controlgroup.apply(this,arguments))}),t.ui.button,t.extend(t.ui,{datepicker:{version:"1.12.1"}});var m;t.extend(s.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(t){return a(this._defaults,t||{}),this},_attachDatepicker:function(e,i){var s,n,o;s=e.nodeName.toLowerCase(),n="div"===s||"span"===s,e.id||(this.uuid+=1,e.id="dp"+this.uuid),o=this._newInst(t(e),n),o.settings=t.extend({},i||{}),"input"===s?this._connectDatepicker(e,o):n&&this._inlineDatepicker(e,o)},_newInst:function(e,i){var s=e[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?n(t("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(e,i){var s=t(e);i.append=t([]),i.trigger=t([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).on("keydown",this._doKeyDown).on("keypress",this._doKeyPress).on("keyup",this._doKeyUp),this._autoSize(i),t.data(e,"datepicker",i),i.settings.disabled&&this._disableDatepicker(e))},_attachments:function(e,i){var s,n,o,a=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),a&&(i.append=t("<span class='"+this._appendClass+"'>"+a+"</span>"),e[r?"before":"after"](i.append)),e.off("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&e.on("focus",this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),o=this._get(i,"buttonImage"),i.trigger=t(this._get(i,"buttonImageOnly")?t("<img/>").addClass(this._triggerClass).attr({src:o,alt:n,title:n}):t("<button type='button'></button>").addClass(this._triggerClass).html(o?t("<img/>").attr({src:o,alt:n,title:n}):n)),e[r?"before":"after"](i.trigger),i.trigger.on("click",function(){return t.datepicker._datepickerShowing&&t.datepicker._lastInput===e[0]?t.datepicker._hideDatepicker():t.datepicker._datepickerShowing&&t.datepicker._lastInput!==e[0]?(t.datepicker._hideDatepicker(),t.datepicker._showDatepicker(e[0])):t.datepicker._showDatepicker(e[0]),!1}))},_autoSize:function(t){if(this._get(t,"autoSize")&&!t.inline){var e,i,s,n,o=new Date(2009,11,20),a=this._get(t,"dateFormat");a.match(/[DM]/)&&(e=function(t){for(i=0,s=0,n=0;t.length>n;n++)t[n].length>i&&(i=t[n].length,s=n);return s},o.setMonth(e(this._get(t,a.match(/MM/)?"monthNames":"monthNamesShort"))),o.setDate(e(this._get(t,a.match(/DD/)?"dayNames":"dayNamesShort"))+20-o.getDay())),t.input.attr("size",this._formatDate(t,o).length)}},_inlineDatepicker:function(e,i){var s=t(e);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),t.data(e,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(e),i.dpDiv.css("display","block"))},_dialogDatepicker:function(e,i,s,n,o){var r,h,l,c,u,d=this._dialogInst;return d||(this.uuid+=1,r="dp"+this.uuid,this._dialogInput=t("<input type='text' id='"+r+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.on("keydown",this._doKeyDown),t("body").append(this._dialogInput),d=this._dialogInst=this._newInst(this._dialogInput,!1),d.settings={},t.data(this._dialogInput[0],"datepicker",d)),a(d.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(d,i):i,this._dialogInput.val(i),this._pos=o?o.length?o:[o.pageX,o.pageY]:null,this._pos||(h=document.documentElement.clientWidth,l=document.documentElement.clientHeight,c=document.documentElement.scrollLeft||document.body.scrollLeft,u=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[h/2-100+c,l/2-150+u]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),d.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),t.blockUI&&t.blockUI(this.dpDiv),t.data(this._dialogInput[0],"datepicker",d),this},_destroyDatepicker:function(e){var i,s=t(e),n=t.data(e,"datepicker");s.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),t.removeData(e,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).off("focus",this._showDatepicker).off("keydown",this._doKeyDown).off("keypress",this._doKeyPress).off("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty(),m===n&&(m=null))},_enableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}))},_disableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}),this._disabledInputs[this._disabledInputs.length]=e)},_isDisabledDatepicker:function(t){if(!t)return!1;for(var e=0;this._disabledInputs.length>e;e++)if(this._disabledInputs[e]===t)return!0;return!1},_getInst:function(e){try{return t.data(e,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(e,i,s){var n,o,r,h,l=this._getInst(e);return 2===arguments.length&&"string"==typeof i?"defaults"===i?t.extend({},t.datepicker._defaults):l?"all"===i?t.extend({},l.settings):this._get(l,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),l&&(this._curInst===l&&this._hideDatepicker(),o=this._getDateDatepicker(e,!0),r=this._getMinMaxDate(l,"min"),h=this._getMinMaxDate(l,"max"),a(l.settings,n),null!==r&&void 0!==n.dateFormat&&void 0===n.minDate&&(l.settings.minDate=this._formatDate(l,r)),null!==h&&void 0!==n.dateFormat&&void 0===n.maxDate&&(l.settings.maxDate=this._formatDate(l,h)),"disabled"in n&&(n.disabled?this._disableDatepicker(e):this._enableDatepicker(e)),this._attachments(t(e),l),this._autoSize(l),this._setDate(l,o),this._updateAlternate(l),this._updateDatepicker(l)),void 0)},_changeDatepicker:function(t,e,i){this._optionDatepicker(t,e,i)},_refreshDatepicker:function(t){var e=this._getInst(t);e&&this._updateDatepicker(e)},_setDateDatepicker:function(t,e){var i=this._getInst(t);i&&(this._setDate(i,e),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(t,e){var i=this._getInst(t);return i&&!i.inline&&this._setDateFromField(i,e),i?this._getDate(i):null},_doKeyDown:function(e){var i,s,n,o=t.datepicker._getInst(e.target),a=!0,r=o.dpDiv.is(".ui-datepicker-rtl");if(o._keyEvent=!0,t.datepicker._datepickerShowing)switch(e.keyCode){case 9:t.datepicker._hideDatepicker(),a=!1;break;case 13:return n=t("td."+t.datepicker._dayOverClass+":not(."+t.datepicker._currentClass+")",o.dpDiv),n[0]&&t.datepicker._selectDay(e.target,o.selectedMonth,o.selectedYear,n[0]),i=t.datepicker._get(o,"onSelect"),i?(s=t.datepicker._formatDate(o),i.apply(o.input?o.input[0]:null,[s,o])):t.datepicker._hideDatepicker(),!1;case 27:t.datepicker._hideDatepicker();break;case 33:t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 34:t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 35:(e.ctrlKey||e.metaKey)&&t.datepicker._clearDate(e.target),a=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&t.datepicker._gotoToday(e.target),a=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?1:-1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,-7,"D"),a=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?-1:1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,7,"D"),a=e.ctrlKey||e.metaKey;break;default:a=!1}else 36===e.keyCode&&e.ctrlKey?t.datepicker._showDatepicker(this):a=!1;a&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(e){var i,s,n=t.datepicker._getInst(e.target);return t.datepicker._get(n,"constrainInput")?(i=t.datepicker._possibleChars(t.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),e.ctrlKey||e.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(e){var i,s=t.datepicker._getInst(e.target);if(s.input.val()!==s.lastVal)try{i=t.datepicker.parseDate(t.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,t.datepicker._getFormatConfig(s)),i&&(t.datepicker._setDateFromField(s),t.datepicker._updateAlternate(s),t.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(e){if(e=e.target||e,"input"!==e.nodeName.toLowerCase()&&(e=t("input",e.parentNode)[0]),!t.datepicker._isDisabledDatepicker(e)&&t.datepicker._lastInput!==e){var s,n,o,r,h,l,c;s=t.datepicker._getInst(e),t.datepicker._curInst&&t.datepicker._curInst!==s&&(t.datepicker._curInst.dpDiv.stop(!0,!0),s&&t.datepicker._datepickerShowing&&t.datepicker._hideDatepicker(t.datepicker._curInst.input[0])),n=t.datepicker._get(s,"beforeShow"),o=n?n.apply(e,[e,s]):{},o!==!1&&(a(s.settings,o),s.lastVal=null,t.datepicker._lastInput=e,t.datepicker._setDateFromField(s),t.datepicker._inDialog&&(e.value=""),t.datepicker._pos||(t.datepicker._pos=t.datepicker._findPos(e),t.datepicker._pos[1]+=e.offsetHeight),r=!1,t(e).parents().each(function(){return r|="fixed"===t(this).css("position"),!r}),h={left:t.datepicker._pos[0],top:t.datepicker._pos[1]},t.datepicker._pos=null,s.dpDiv.empty(),s.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),t.datepicker._updateDatepicker(s),h=t.datepicker._checkOffset(s,h,r),s.dpDiv.css({position:t.datepicker._inDialog&&t.blockUI?"static":r?"fixed":"absolute",display:"none",left:h.left+"px",top:h.top+"px"}),s.inline||(l=t.datepicker._get(s,"showAnim"),c=t.datepicker._get(s,"duration"),s.dpDiv.css("z-index",i(t(e))+1),t.datepicker._datepickerShowing=!0,t.effects&&t.effects.effect[l]?s.dpDiv.show(l,t.datepicker._get(s,"showOptions"),c):s.dpDiv[l||"show"](l?c:null),t.datepicker._shouldFocusInput(s)&&s.input.trigger("focus"),t.datepicker._curInst=s))
-}},_updateDatepicker:function(e){this.maxRows=4,m=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e);var i,s=this._getNumberOfMonths(e),n=s[1],a=17,r=e.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&e.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),e.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e===t.datepicker._curInst&&t.datepicker._datepickerShowing&&t.datepicker._shouldFocusInput(e)&&e.input.trigger("focus"),e.yearshtml&&(i=e.yearshtml,setTimeout(function(){i===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),i=e.yearshtml=null},0))},_shouldFocusInput:function(t){return t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&!t.input.is(":focus")},_checkOffset:function(e,i,s){var n=e.dpDiv.outerWidth(),o=e.dpDiv.outerHeight(),a=e.input?e.input.outerWidth():0,r=e.input?e.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:t(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:t(document).scrollTop());return i.left-=this._get(e,"isRTL")?n-a:0,i.left-=s&&i.left===e.input.offset().left?t(document).scrollLeft():0,i.top-=s&&i.top===e.input.offset().top+r?t(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+o>l&&l>o?Math.abs(o+r):0),i},_findPos:function(e){for(var i,s=this._getInst(e),n=this._get(s,"isRTL");e&&("hidden"===e.type||1!==e.nodeType||t.expr.filters.hidden(e));)e=e[n?"previousSibling":"nextSibling"];return i=t(e).offset(),[i.left,i.top]},_hideDatepicker:function(e){var i,s,n,o,a=this._curInst;!a||e&&a!==t.data(e,"datepicker")||this._datepickerShowing&&(i=this._get(a,"showAnim"),s=this._get(a,"duration"),n=function(){t.datepicker._tidyDialog(a)},t.effects&&(t.effects.effect[i]||t.effects[i])?a.dpDiv.hide(i,t.datepicker._get(a,"showOptions"),s,n):a.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,o=this._get(a,"onClose"),o&&o.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),t.blockUI&&(t.unblockUI(),t("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(t){t.dpDiv.removeClass(this._dialogClass).off(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(t.datepicker._curInst){var i=t(e.target),s=t.datepicker._getInst(i[0]);(i[0].id!==t.datepicker._mainDivId&&0===i.parents("#"+t.datepicker._mainDivId).length&&!i.hasClass(t.datepicker.markerClassName)&&!i.closest("."+t.datepicker._triggerClass).length&&t.datepicker._datepickerShowing&&(!t.datepicker._inDialog||!t.blockUI)||i.hasClass(t.datepicker.markerClassName)&&t.datepicker._curInst!==s)&&t.datepicker._hideDatepicker()}},_adjustDate:function(e,i,s){var n=t(e),o=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(o,i+("M"===s?this._get(o,"showCurrentAtPos"):0),s),this._updateDatepicker(o))},_gotoToday:function(e){var i,s=t(e),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(e,i,s){var n=t(e),o=this._getInst(n[0]);o["selected"+("M"===s?"Month":"Year")]=o["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(o),this._adjustDate(n)},_selectDay:function(e,i,s,n){var o,a=t(e);t(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(a[0])||(o=this._getInst(a[0]),o.selectedDay=o.currentDay=t("a",n).html(),o.selectedMonth=o.currentMonth=i,o.selectedYear=o.currentYear=s,this._selectDate(e,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear)))},_clearDate:function(e){var i=t(e);this._selectDate(i,"")},_selectDate:function(e,i){var s,n=t(e),o=this._getInst(n[0]);i=null!=i?i:this._formatDate(o),o.input&&o.input.val(i),this._updateAlternate(o),s=this._get(o,"onSelect"),s?s.apply(o.input?o.input[0]:null,[i,o]):o.input&&o.input.trigger("change"),o.inline?this._updateDatepicker(o):(this._hideDatepicker(),this._lastInput=o.input[0],"object"!=typeof o.input[0]&&o.input.trigger("focus"),this._lastInput=null)},_updateAlternate:function(e){var i,s,n,o=this._get(e,"altField");o&&(i=this._get(e,"altFormat")||this._get(e,"dateFormat"),s=this._getDate(e),n=this.formatDate(i,s,this._getFormatConfig(e)),t(o).val(n))},noWeekends:function(t){var e=t.getDay();return[e>0&&6>e,""]},iso8601Week:function(t){var e,i=new Date(t.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),e=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((e-i)/864e5)/7)+1},parseDate:function(e,i,s){if(null==e||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,o,a,r,h=0,l=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,c="string"!=typeof l?l:(new Date).getFullYear()%100+parseInt(l,10),u=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,d=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,g=-1,m=-1,_=-1,v=-1,b=!1,y=function(t){var i=e.length>n+1&&e.charAt(n+1)===t;return i&&n++,i},w=function(t){var e=y(t),s="@"===t?14:"!"===t?20:"y"===t&&e?4:"o"===t?3:2,n="y"===t?s:1,o=RegExp("^\\d{"+n+","+s+"}"),a=i.substring(h).match(o);if(!a)throw"Missing number at position "+h;return h+=a[0].length,parseInt(a[0],10)},k=function(e,s,n){var o=-1,a=t.map(y(e)?n:s,function(t,e){return[[e,t]]}).sort(function(t,e){return-(t[1].length-e[1].length)});if(t.each(a,function(t,e){var s=e[1];return i.substr(h,s.length).toLowerCase()===s.toLowerCase()?(o=e[0],h+=s.length,!1):void 0}),-1!==o)return o+1;throw"Unknown name at position "+h},x=function(){if(i.charAt(h)!==e.charAt(n))throw"Unexpected literal at position "+h;h++};for(n=0;e.length>n;n++)if(b)"'"!==e.charAt(n)||y("'")?x():b=!1;else switch(e.charAt(n)){case"d":_=w("d");break;case"D":k("D",u,d);break;case"o":v=w("o");break;case"m":m=w("m");break;case"M":m=k("M",p,f);break;case"y":g=w("y");break;case"@":r=new Date(w("@")),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"!":r=new Date((w("!")-this._ticksTo1970)/1e4),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"'":y("'")?x():b=!0;break;default:x()}if(i.length>h&&(a=i.substr(h),!/^\s+/.test(a)))throw"Extra/unparsed characters found in date: "+a;if(-1===g?g=(new Date).getFullYear():100>g&&(g+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c>=g?0:-100)),v>-1)for(m=1,_=v;;){if(o=this._getDaysInMonth(g,m-1),o>=_)break;m++,_-=o}if(r=this._daylightSavingAdjust(new Date(g,m-1,_)),r.getFullYear()!==g||r.getMonth()+1!==m||r.getDate()!==_)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(t,e,i){if(!e)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,o=(i?i.dayNames:null)||this._defaults.dayNames,a=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(e){var i=t.length>s+1&&t.charAt(s+1)===e;return i&&s++,i},l=function(t,e,i){var s=""+e;if(h(t))for(;i>s.length;)s="0"+s;return s},c=function(t,e,i,s){return h(t)?s[e]:i[e]},u="",d=!1;if(e)for(s=0;t.length>s;s++)if(d)"'"!==t.charAt(s)||h("'")?u+=t.charAt(s):d=!1;else switch(t.charAt(s)){case"d":u+=l("d",e.getDate(),2);break;case"D":u+=c("D",e.getDay(),n,o);break;case"o":u+=l("o",Math.round((new Date(e.getFullYear(),e.getMonth(),e.getDate()).getTime()-new Date(e.getFullYear(),0,0).getTime())/864e5),3);break;case"m":u+=l("m",e.getMonth()+1,2);break;case"M":u+=c("M",e.getMonth(),a,r);break;case"y":u+=h("y")?e.getFullYear():(10>e.getFullYear()%100?"0":"")+e.getFullYear()%100;break;case"@":u+=e.getTime();break;case"!":u+=1e4*e.getTime()+this._ticksTo1970;break;case"'":h("'")?u+="'":d=!0;break;default:u+=t.charAt(s)}return u},_possibleChars:function(t){var e,i="",s=!1,n=function(i){var s=t.length>e+1&&t.charAt(e+1)===i;return s&&e++,s};for(e=0;t.length>e;e++)if(s)"'"!==t.charAt(e)||n("'")?i+=t.charAt(e):s=!1;else switch(t.charAt(e)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=t.charAt(e)}return i},_get:function(t,e){return void 0!==t.settings[e]?t.settings[e]:this._defaults[e]},_setDateFromField:function(t,e){if(t.input.val()!==t.lastVal){var i=this._get(t,"dateFormat"),s=t.lastVal=t.input?t.input.val():null,n=this._getDefaultDate(t),o=n,a=this._getFormatConfig(t);try{o=this.parseDate(i,s,a)||n}catch(r){s=e?"":s}t.selectedDay=o.getDate(),t.drawMonth=t.selectedMonth=o.getMonth(),t.drawYear=t.selectedYear=o.getFullYear(),t.currentDay=s?o.getDate():0,t.currentMonth=s?o.getMonth():0,t.currentYear=s?o.getFullYear():0,this._adjustInstDate(t)}},_getDefaultDate:function(t){return this._restrictMinMax(t,this._determineDate(t,this._get(t,"defaultDate"),new Date))},_determineDate:function(e,i,s){var n=function(t){var e=new Date;return e.setDate(e.getDate()+t),e},o=function(i){try{return t.datepicker.parseDate(t.datepicker._get(e,"dateFormat"),i,t.datepicker._getFormatConfig(e))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?t.datepicker._getDate(e):null)||new Date,o=n.getFullYear(),a=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":a+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a));break;case"y":case"Y":o+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a))}l=h.exec(i)}return new Date(o,a,r)},a=null==i||""===i?s:"string"==typeof i?o(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return a=a&&"Invalid Date"==""+a?s:a,a&&(a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0)),this._daylightSavingAdjust(a)},_daylightSavingAdjust:function(t){return t?(t.setHours(t.getHours()>12?t.getHours()+2:0),t):null},_setDate:function(t,e,i){var s=!e,n=t.selectedMonth,o=t.selectedYear,a=this._restrictMinMax(t,this._determineDate(t,e,new Date));t.selectedDay=t.currentDay=a.getDate(),t.drawMonth=t.selectedMonth=t.currentMonth=a.getMonth(),t.drawYear=t.selectedYear=t.currentYear=a.getFullYear(),n===t.selectedMonth&&o===t.selectedYear||i||this._notifyChange(t),this._adjustInstDate(t),t.input&&t.input.val(s?"":this._formatDate(t))},_getDate:function(t){var e=!t.currentYear||t.input&&""===t.input.val()?null:this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return e},_attachHandlers:function(e){var i=this._get(e,"stepMonths"),s="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){t.datepicker._adjustDate(s,-i,"M")},next:function(){t.datepicker._adjustDate(s,+i,"M")},hide:function(){t.datepicker._hideDatepicker()},today:function(){t.datepicker._gotoToday(s)},selectDay:function(){return t.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return t.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return t.datepicker._selectMonthYear(s,this,"Y"),!1}};t(this).on(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(t){var e,i,s,n,o,a,r,h,l,c,u,d,p,f,g,m,_,v,b,y,w,k,x,C,D,I,T,P,M,S,H,z,O,A,N,W,E,F,L,R=new Date,B=this._daylightSavingAdjust(new Date(R.getFullYear(),R.getMonth(),R.getDate())),Y=this._get(t,"isRTL"),j=this._get(t,"showButtonPanel"),q=this._get(t,"hideIfNoPrevNext"),K=this._get(t,"navigationAsDateFormat"),U=this._getNumberOfMonths(t),V=this._get(t,"showCurrentAtPos"),$=this._get(t,"stepMonths"),X=1!==U[0]||1!==U[1],G=this._daylightSavingAdjust(t.currentDay?new Date(t.currentYear,t.currentMonth,t.currentDay):new Date(9999,9,9)),Q=this._getMinMaxDate(t,"min"),J=this._getMinMaxDate(t,"max"),Z=t.drawMonth-V,te=t.drawYear;if(0>Z&&(Z+=12,te--),J)for(e=this._daylightSavingAdjust(new Date(J.getFullYear(),J.getMonth()-U[0]*U[1]+1,J.getDate())),e=Q&&Q>e?Q:e;this._daylightSavingAdjust(new Date(te,Z,1))>e;)Z--,0>Z&&(Z=11,te--);for(t.drawMonth=Z,t.drawYear=te,i=this._get(t,"prevText"),i=K?this.formatDate(i,this._daylightSavingAdjust(new Date(te,Z-$,1)),this._getFormatConfig(t)):i,s=this._canAdjustMonth(t,-1,te,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":q?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(t,"nextText"),n=K?this.formatDate(n,this._daylightSavingAdjust(new Date(te,Z+$,1)),this._getFormatConfig(t)):n,o=this._canAdjustMonth(t,1,te,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":q?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",a=this._get(t,"currentText"),r=this._get(t,"gotoCurrent")&&t.currentDay?G:B,a=K?this.formatDate(a,r,this._getFormatConfig(t)):a,h=t.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(t,"closeText")+"</button>",l=j?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(t,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+a+"</button>":"")+(Y?"":h)+"</div>":"",c=parseInt(this._get(t,"firstDay"),10),c=isNaN(c)?0:c,u=this._get(t,"showWeek"),d=this._get(t,"dayNames"),p=this._get(t,"dayNamesMin"),f=this._get(t,"monthNames"),g=this._get(t,"monthNamesShort"),m=this._get(t,"beforeShowDay"),_=this._get(t,"showOtherMonths"),v=this._get(t,"selectOtherMonths"),b=this._getDefaultDate(t),y="",k=0;U[0]>k;k++){for(x="",this.maxRows=4,C=0;U[1]>C;C++){if(D=this._daylightSavingAdjust(new Date(te,Z,t.selectedDay)),I=" ui-corner-all",T="",X){if(T+="<div class='ui-datepicker-group",U[1]>1)switch(C){case 0:T+=" ui-datepicker-group-first",I=" ui-corner-"+(Y?"right":"left");break;case U[1]-1:T+=" ui-datepicker-group-last",I=" ui-corner-"+(Y?"left":"right");break;default:T+=" ui-datepicker-group-middle",I=""}T+="'>"}for(T+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+I+"'>"+(/all|left/.test(I)&&0===k?Y?o:s:"")+(/all|right/.test(I)&&0===k?Y?s:o:"")+this._generateMonthYearHeader(t,Z,te,Q,J,k>0||C>0,f,g)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",P=u?"<th class='ui-datepicker-week-col'>"+this._get(t,"weekHeader")+"</th>":"",w=0;7>w;w++)M=(w+c)%7,P+="<th scope='col'"+((w+c+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+d[M]+"'>"+p[M]+"</span></th>";for(T+=P+"</tr></thead><tbody>",S=this._getDaysInMonth(te,Z),te===t.selectedYear&&Z===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,S)),H=(this._getFirstDayOfMonth(te,Z)-c+7)%7,z=Math.ceil((H+S)/7),O=X?this.maxRows>z?this.maxRows:z:z,this.maxRows=O,A=this._daylightSavingAdjust(new Date(te,Z,1-H)),N=0;O>N;N++){for(T+="<tr>",W=u?"<td class='ui-datepicker-week-col'>"+this._get(t,"calculateWeek")(A)+"</td>":"",w=0;7>w;w++)E=m?m.apply(t.input?t.input[0]:null,[A]):[!0,""],F=A.getMonth()!==Z,L=F&&!v||!E[0]||Q&&Q>A||J&&A>J,W+="<td class='"+((w+c+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(A.getTime()===D.getTime()&&Z===t.selectedMonth&&t._keyEvent||b.getTime()===A.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!_?"":" "+E[1]+(A.getTime()===G.getTime()?" "+this._currentClass:"")+(A.getTime()===B.getTime()?" ui-datepicker-today":""))+"'"+(F&&!_||!E[2]?"":" title='"+E[2].replace(/'/g,"&#39;")+"'")+(L?"":" data-handler='selectDay' data-event='click' data-month='"+A.getMonth()+"' data-year='"+A.getFullYear()+"'")+">"+(F&&!_?"&#xa0;":L?"<span class='ui-state-default'>"+A.getDate()+"</span>":"<a class='ui-state-default"+(A.getTime()===B.getTime()?" ui-state-highlight":"")+(A.getTime()===G.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+A.getDate()+"</a>")+"</td>",A.setDate(A.getDate()+1),A=this._daylightSavingAdjust(A);T+=W+"</tr>"}Z++,Z>11&&(Z=0,te++),T+="</tbody></table>"+(X?"</div>"+(U[0]>0&&C===U[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),x+=T}y+=x}return y+=l,t._keyEvent=!1,y},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var h,l,c,u,d,p,f,g,m=this._get(t,"changeMonth"),_=this._get(t,"changeYear"),v=this._get(t,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",y="";if(o||!m)y+="<span class='ui-datepicker-month'>"+a[e]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,y+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",c=0;12>c;c++)(!h||c>=s.getMonth())&&(!l||n.getMonth()>=c)&&(y+="<option value='"+c+"'"+(c===e?" selected='selected'":"")+">"+r[c]+"</option>");y+="</select>"}if(v||(b+=y+(!o&&m&&_?"":"&#xa0;")),!t.yearshtml)if(t.yearshtml="",o||!_)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(u=this._get(t,"yearRange").split(":"),d=(new Date).getFullYear(),p=function(t){var e=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?d+parseInt(t,10):parseInt(t,10);return isNaN(e)?d:e},f=p(u[0]),g=Math.max(f,p(u[1]||"")),f=s?Math.max(f,s.getFullYear()):f,g=n?Math.min(g,n.getFullYear()):g,t.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";g>=f;f++)t.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";t.yearshtml+="</select>",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),v&&(b+=(!o&&m&&_?"":"&#xa0;")+y),b+="</div>"},_adjustInstDate:function(t,e,i){var s=t.selectedYear+("Y"===i?e:0),n=t.selectedMonth+("M"===i?e:0),o=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),a=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,o)));t.selectedDay=a.getDate(),t.drawMonth=t.selectedMonth=a.getMonth(),t.drawYear=t.selectedYear=a.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=i&&i>e?i:e;return s&&n>s?s:n},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){var e=this._get(t,"numberOfMonths");return null==e?[1,1]:"number"==typeof e?[1,e]:e},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),o=this._daylightSavingAdjust(new Date(i,s+(0>e?e:n[0]*n[1]),1));return 0>e&&o.setDate(this._getDaysInMonth(o.getFullYear(),o.getMonth())),this._isInRange(t,o)},_isInRange:function(t,e){var i,s,n=this._getMinMaxDate(t,"min"),o=this._getMinMaxDate(t,"max"),a=null,r=null,h=this._get(t,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),a=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(a+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||e.getTime()>=n.getTime())&&(!o||e.getTime()<=o.getTime())&&(!a||e.getFullYear()>=a)&&(!r||r>=e.getFullYear())},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),{shortYearCutoff:e,dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);var n=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),n,this._getFormatConfig(t))}}),t.fn.datepicker=function(e){if(!this.length)return this;t.datepicker.initialized||(t(document).on("mousedown",t.datepicker._checkExternalClick),t.datepicker.initialized=!0),0===t("#"+t.datepicker._mainDivId).length&&t("body").append(t.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof e||"isDisabled"!==e&&"getDate"!==e&&"widget"!==e?"option"===e&&2===arguments.length&&"string"==typeof arguments[1]?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof e?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this].concat(i)):t.datepicker._attachDatepicker(this,e)}):t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i))},t.datepicker=new s,t.datepicker.initialized=!1,t.datepicker.uuid=(new Date).getTime(),t.datepicker.version="1.12.1",t.datepicker,t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var _=!1;t(document).on("mouseup",function(){_=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!_){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,s=1===e.which,n="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),_=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,_=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.ui.plugin={add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;o.length>n;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},t.ui.safeBlur=function(e){e&&"body"!==e.nodeName.toLowerCase()&&t(e).trigger("blur")},t.widget("ui.draggable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(t,e){this._super(t,e),"handle"===t&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(this._blurActiveElement(e),this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(e){this.iframeBlocks=this.document.find(e).map(function(){var e=t(this);return t("<div>").css("position","absolute").appendTo(e.parent()).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(e){var i=t.ui.safeActiveElement(this.document[0]),s=t(e.target);s.closest(i).length||t.ui.safeBlur(i)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===t(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(e),this.originalPosition=this.position=this._generatePosition(e,!1),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_refreshOffsets:function(t){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:t.pageX-this.offset.left,top:t.pageY-this.offset.top}},_mouseDrag:function(e,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp(new t.Event("mouseup",e)),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1},_mouseUp:function(e){return this._unblockFrames(),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),this.handleElement.is(e.target)&&this.element.trigger("focus"),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new t.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper),n=s?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_isRootNode:function(t){return/(html|body)/i.test(t.tagName)||t===this.document[0]},_getParentOffset:function(){var e=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.element.position(),e=this._isRootNode(this.scrollParent[0]);return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+(e?0:this.scrollParent.scrollTop()),left:t.left-(parseInt(this.helper.css("left"),10)||0)+(e?0:this.scrollParent.scrollLeft())}
-},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options,o=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,t(o).width()-this.helperProportions.width-this.margins.left,(t(o).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(t,e){e||(e=this.position);var i="absolute"===t?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s,n,o,a=this.options,r=this._isRootNode(this.scrollParent[0]),h=t.pageX,l=t.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,h=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o),"y"===a.axis&&(h=this.originalPageX),"x"===a.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s,this],!0),/^(drag|start|stop)/.test(e)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i,s){var n=t.extend({},i,{item:s.element});s.sortables=[],t(s.options.connectToSortable).each(function(){var i=t(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",e,n))})},stop:function(e,i,s){var n=t.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,t.each(s.sortables,function(){var t=this;t.isOver?(t.isOver=0,s.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,n))})},drag:function(e,i,s){t.each(s.sortables,function(){var n=!1,o=this;o.positionAbs=s.positionAbs,o.helperProportions=s.helperProportions,o.offset.click=s.offset.click,o._intersectsWith(o.containerCache)&&(n=!0,t.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==o&&this._intersectsWith(this.containerCache)&&t.contains(o.element[0],this.element[0])&&(n=!1),n})),n?(o.isOver||(o.isOver=1,s._parent=i.helper.parent(),o.currentItem=i.helper.appendTo(o.element).data("ui-sortable-item",!0),o.options._helper=o.options.helper,o.options.helper=function(){return i.helper[0]},e.target=o.currentItem[0],o._mouseCapture(e,!0),o._mouseStart(e,!0,!0),o.offset.click.top=s.offset.click.top,o.offset.click.left=s.offset.click.left,o.offset.parent.left-=s.offset.parent.left-o.offset.parent.left,o.offset.parent.top-=s.offset.parent.top-o.offset.parent.top,s._trigger("toSortable",e),s.dropped=o.element,t.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,o.fromOutside=s),o.currentItem&&(o._mouseDrag(e),i.position=o.position)):o.isOver&&(o.isOver=0,o.cancelHelperRemoval=!0,o.options._revert=o.options.revert,o.options.revert=!1,o._trigger("out",e,o._uiHash(o)),o._mouseStop(e,!0),o.options.revert=o.options._revert,o.options.helper=o.options._helper,o.placeholder&&o.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(e),i.position=s._generatePosition(e,!0),s._trigger("fromSortable",e),s.dropped=!1,t.each(s.sortables,function(){this.refreshPositions()}))})}}),t.ui.plugin.add("draggable","cursor",{start:function(e,i,s){var n=t("body"),o=s.options;n.css("cursor")&&(o._cursor=n.css("cursor")),n.css("cursor",o.cursor)},stop:function(e,i,s){var n=s.options;n._cursor&&t("body").css("cursor",n._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("opacity")&&(o._opacity=n.css("opacity")),n.css("opacity",o.opacity)},stop:function(e,i,s){var n=s.options;n._opacity&&t(i.helper).css("opacity",n._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(e,i,s){var n=s.options,o=!1,a=s.scrollParentNotHidden[0],r=s.document[0];a!==r&&"HTML"!==a.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+a.offsetHeight-e.pageY<n.scrollSensitivity?a.scrollTop=o=a.scrollTop+n.scrollSpeed:e.pageY-s.overflowOffset.top<n.scrollSensitivity&&(a.scrollTop=o=a.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+a.offsetWidth-e.pageX<n.scrollSensitivity?a.scrollLeft=o=a.scrollLeft+n.scrollSpeed:e.pageX-s.overflowOffset.left<n.scrollSensitivity&&(a.scrollLeft=o=a.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(e.pageY-t(r).scrollTop()<n.scrollSensitivity?o=t(r).scrollTop(t(r).scrollTop()-n.scrollSpeed):t(window).height()-(e.pageY-t(r).scrollTop())<n.scrollSensitivity&&(o=t(r).scrollTop(t(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(e.pageX-t(r).scrollLeft()<n.scrollSensitivity?o=t(r).scrollLeft(t(r).scrollLeft()-n.scrollSpeed):t(window).width()-(e.pageX-t(r).scrollLeft())<n.scrollSensitivity&&(o=t(r).scrollLeft(t(r).scrollLeft()+n.scrollSpeed)))),o!==!1&&t.ui.ddmanager&&!n.dropBehaviour&&t.ui.ddmanager.prepareOffsets(s,e)}}),t.ui.plugin.add("draggable","snap",{start:function(e,i,s){var n=s.options;s.snapElements=[],t(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var e=t(this),i=e.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:e.outerWidth(),height:e.outerHeight(),top:i.top,left:i.left})})},drag:function(e,i,s){var n,o,a,r,h,l,c,u,d,p,f=s.options,g=f.snapTolerance,m=i.offset.left,_=m+s.helperProportions.width,v=i.offset.top,b=v+s.helperProportions.height;for(d=s.snapElements.length-1;d>=0;d--)h=s.snapElements[d].left-s.margins.left,l=h+s.snapElements[d].width,c=s.snapElements[d].top-s.margins.top,u=c+s.snapElements[d].height,h-g>_||m>l+g||c-g>b||v>u+g||!t.contains(s.snapElements[d].item.ownerDocument,s.snapElements[d].item)?(s.snapElements[d].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=!1):("inner"!==f.snapMode&&(n=g>=Math.abs(c-b),o=g>=Math.abs(u-v),a=g>=Math.abs(h-_),r=g>=Math.abs(l-m),n&&(i.position.top=s._convertPositionTo("relative",{top:c-s.helperProportions.height,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||o||a||r,"outer"!==f.snapMode&&(n=g>=Math.abs(c-v),o=g>=Math.abs(u-b),a=g>=Math.abs(h-m),r=g>=Math.abs(l-_),n&&(i.position.top=s._convertPositionTo("relative",{top:c,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[d].snapping&&(n||o||a||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=n||o||a||r||p)}}),t.ui.plugin.add("draggable","stack",{start:function(e,i,s){var n,o=s.options,a=t.makeArray(t(o.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});a.length&&(n=parseInt(t(a[0]).css("zIndex"),10)||0,t(a).each(function(e){t(this).css("zIndex",n+e)}),this.css("zIndex",n+a.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("zIndex")&&(o._zIndex=n.css("zIndex")),n.css("zIndex",o.zIndex)},stop:function(e,i,s){var n=s.options;n._zIndex&&t(i.helper).css("zIndex",n._zIndex)}}),t.ui.draggable,t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,h=this._change[o];return this._updatePrevProperties(),h?(i=h.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,h,l=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,h=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,l.animate||this.element.css(t.extend(a,{top:h,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!l.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:this._isNumber(a.maxHeight)?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,h=this.originalPosition.top+this.originalSize.height,l=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&l&&(t.left=r-e.minWidth),s&&l&&(t.left=r-e.maxWidth),a&&c&&(t.top=h-e.minHeight),n&&c&&(t.top=h-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-a},l=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(h,c&&l?{top:c,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,h=t(this).resizable("instance"),l=h.options,c=h.element,u=l.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(h.containerElement=t(d),/document/.test(u)||u===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=h._num(e.css("padding"+s))}),h.containerOffset=e.offset(),h.containerPosition=e.position(),h.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,o=h.containerSize.width,a=h._hasScroll(d,"left")?d.scrollWidth:o,r=h._hasScroll(d)?d.scrollHeight:n,h.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,h=a.containerOffset,l=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=h),l.left<(a._helper?h.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-h.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?h.left:0),l.top<(a._helper?h.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-h.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?h.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-h.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-h.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),h=a.outerWidth()-e.sizeDiff.width,l=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,c=h[1]||1,u=Math.round((n.width-o.width)/l)*l,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,g=s.maxWidth&&p>s.maxWidth,m=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=h,_&&(p+=l),v&&(f+=c),g&&(p-=l),m&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-l)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-l>0?(i.size.width=p,i.position.left=a.left-u):(p=l-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable,t.widget("ui.dialog",{version:"1.12.1",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog
-},disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||t.ui.safeBlur(t.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(e,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+t(this).css("z-index")}).get(),o=Math.max.apply(null,n);return o>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",o+1),s=!0),s&&!i&&this._trigger("focus",e),s},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=t(t.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var t=this._focusedElement;t||(t=this.element.find("[autofocus]")),t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).trigger("focus")},_keepFocus:function(e){function i(){var e=t.ui.safeActiveElement(this.document[0]),i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),void 0;if(e.keyCode===t.ui.keyCode.TAB&&!e.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(this._delay(function(){n.trigger("focus")}),e.preventDefault()):(this._delay(function(){s.trigger("focus")}),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=t("<button type='button'></button>").button({label:t("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(e,"ui-dialog-title"),this._title(e),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title?t.text(this.options.title):t.html("&#160;")},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this._removeClass(this.uiDialog,"ui-dialog-buttons"),void 0):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,o={icon:s.icon,iconPosition:s.iconPosition,showLabel:s.showLabel,icons:s.icons,text:s.text},delete s.click,delete s.icon,delete s.iconPosition,delete s.showLabel,delete s.icons,"boolean"==typeof s.text&&delete s.text,t("<button></button>",s).button(o).appendTo(e.uiButtonSet).on("click",function(){n.apply(e.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){i._addClass(t(this),"ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){var a=o.offset.left-i.document.scrollLeft(),r=o.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(a>=0?"+":"")+a+" "+"top"+(r>=0?"+":"")+r,of:i.window},i._removeClass(t(this),"ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){i._addClass(t(this),"ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){var a=i.uiDialog.offset(),r=a.left-i.document.scrollLeft(),h=a.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},i._removeClass(t(this),"ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_trackFocus:function(){this._on(this.widget(),{focusin:function(e){this._makeFocusTarget(),this._focusedElement=t(e.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var e=this._trackingInstances(),i=t.inArray(this,e);-1!==i&&e.splice(i,1)},_trackingInstances:function(){var t=this.document.data("ui-dialog-instances");return t||(t=[],this.document.data("ui-dialog-instances",t)),t},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(e){var i=this,s=!1,n={};t.each(e,function(t,e){i._setOption(t,e),t in i.sizeRelatedOptions&&(s=!0),t in i.resizableRelatedOptions&&(n[t]=e)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,i){var s,n,o=this.uiDialog;"disabled"!==e&&(this._super(e,i),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:t("<a>").text(""+this.options.closeText).html()}),"draggable"===e&&(s=o.is(":data(ui-draggable)"),s&&!i&&o.draggable("destroy"),!s&&i&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(n=o.is(":data(ui-resizable)"),n&&!i&&o.resizable("destroy"),n&&"string"==typeof i&&o.resizable("option","handles",i),n||i===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=!0;this._delay(function(){e=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(t){e||this._allowInteraction(t)||(t.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=t("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var t=this.document.data("ui-dialog-overlays")-1;t?this.document.data("ui-dialog-overlays",t):(this._off(this.document,"focusin"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(t,e){"dialogClass"===t&&this.uiDialog.removeClass(this.options.dialogClass).addClass(e),this._superApply(arguments)}}),t.ui.dialog,t.widget("ui.droppable",{version:"1.12.1",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(s)?s:function(t){return t.is(s)},this.proportions=function(){return arguments.length?(e=arguments[0],void 0):e?e:e={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this._addClass("ui-droppable")},_addToManager:function(e){t.ui.ddmanager.droppables[e]=t.ui.ddmanager.droppables[e]||[],t.ui.ddmanager.droppables[e].push(this)},_splice:function(t){for(var e=0;t.length>e;e++)t[e]===this&&t.splice(e,1)},_destroy:function(){var e=t.ui.ddmanager.droppables[this.options.scope];this._splice(e)},_setOption:function(e,i){if("accept"===e)this.accept=t.isFunction(i)?i:function(t){return t.is(i)};else if("scope"===e){var s=t.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(e,i)},_activate:function(e){var i=t.ui.ddmanager.current;this._addActiveClass(),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this._removeActiveClass(),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._addHoverClass(),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._removeHoverClass(),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=t(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&v(s,t.extend(i,{offset:i.element.offset()}),i.options.tolerance,e)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}});var v=t.ui.intersect=function(){function t(t,e,i){return t>=e&&e+i>t}return function(e,i,s,n){if(!i.offset)return!1;var o=(e.positionAbs||e.position.absolute).left+e.margins.left,a=(e.positionAbs||e.position.absolute).top+e.margins.top,r=o+e.helperProportions.width,h=a+e.helperProportions.height,l=i.offset.left,c=i.offset.top,u=l+i.proportions().width,d=c+i.proportions().height;switch(s){case"fit":return o>=l&&u>=r&&a>=c&&d>=h;case"intersect":return o+e.helperProportions.width/2>l&&u>r-e.helperProportions.width/2&&a+e.helperProportions.height/2>c&&d>h-e.helperProportions.height/2;case"pointer":return t(n.pageY,c,i.proportions().height)&&t(n.pageX,l,i.proportions().width);case"touch":return(a>=c&&d>=a||h>=c&&d>=h||c>a&&h>d)&&(o>=l&&u>=o||r>=l&&u>=r||l>o&&r>u);default:return!1}}}();t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions().height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions({width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight}))}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&v(e,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").on("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=v(e,this,this.options.tolerance,i),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t(this).droppable("instance").options.scope===n}),o.length&&(s=t(o[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").off("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}},t.uiBackCompat!==!1&&t.widget("ui.droppable",t.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}}),t.ui.droppable,t.widget("ui.progressbar",{version:"1.12.1",options:{classes:{"ui-progressbar":"ui-corner-all","ui-progressbar-value":"ui-corner-left","ui-progressbar-complete":"ui-corner-right"},max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.attr({role:"progressbar","aria-valuemin":this.min}),this._addClass("ui-progressbar","ui-widget ui-widget-content"),this.valueDiv=t("<div>").appendTo(this.element),this._addClass(this.valueDiv,"ui-progressbar-value","ui-widget-header"),this._refreshValue()},_destroy:function(){this.element.removeAttr("role aria-valuemin aria-valuemax aria-valuenow"),this.valueDiv.remove()},value:function(t){return void 0===t?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),void 0)},_constrainedValue:function(t){return void 0===t&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).width(i.toFixed(0)+"%"),this._toggleClass(this.valueDiv,"ui-progressbar-complete",null,e===this.options.max)._toggleClass("ui-progressbar-indeterminate",null,this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("<div>").appendTo(this.valueDiv),this._addClass(this.overlayDiv,"ui-progressbar-overlay"))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}}),t.widget("ui.selectable",t.ui.mouse,{version:"1.12.1",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e.elementPos=t(e.element[0]).offset(),e.selectees=t(e.options.filter,e.element[0]),e._addClass(e.selectees,"ui-selectee"),e.selectees.each(function(){var i=t(this),s=i.offset(),n={left:s.left-e.elementPos.left,top:s.top-e.elementPos.top};t.data(this,"selectable-item",{element:this,$element:i,left:n.left,top:n.top,right:n.left+i.outerWidth(),bottom:n.top+i.outerHeight(),startselected:!1,selected:i.hasClass("ui-selected"),selecting:i.hasClass("ui-selecting"),unselecting:i.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=t("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.elementPos=t(this.element[0]).offset(),this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(i._removeClass(s.$element,"ui-selected"),s.selected=!1,i._addClass(s.$element,"ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),i._removeClass(n.$element,s?"ui-unselecting":"ui-selected")._addClass(n.$element,s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,h=e.pageY;return o>r&&(i=r,r=o,o=i),a>h&&(i=h,h=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:h-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),l=!1,c={};i&&i.element!==s.element[0]&&(c.left=i.left+s.elementPos.left,c.right=i.right+s.elementPos.left,c.top=i.top+s.elementPos.top,c.bottom=i.bottom+s.elementPos.top,"touch"===n.tolerance?l=!(c.left>r||o>c.right||c.top>h||a>c.bottom):"fit"===n.tolerance&&(l=c.left>o&&r>c.right&&c.top>a&&h>c.bottom),l?(i.selected&&(s._removeClass(i.$element,"ui-selected"),i.selected=!1),i.unselecting&&(s._removeClass(i.$element,"ui-unselecting"),i.unselecting=!1),i.selecting||(s._addClass(i.$element,"ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,s._addClass(i.$element,"ui-selected"),i.selected=!0):(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,i.startselected&&(s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(s._removeClass(i.$element,"ui-selected"),i.selected=!1,s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-selecting")._addClass(s.$element,"ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}}),t.widget("ui.selectmenu",[t.ui.formResetMixin,{version:"1.12.1",defaultElement:"<select>",options:{appendTo:null,classes:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"},disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:!1,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this._bindFormResetHandler(),this._rendered=!1,this.menuItems=t()},_drawButton:function(){var e,i=this,s=this._parseOption(this.element.find("option:selected"),this.element[0].selectedIndex);this.labels=this.element.labels().attr("for",this.ids.button),this._on(this.labels,{click:function(t){this.button.focus(),t.preventDefault()}}),this.element.hide(),this.button=t("<span>",{tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true",title:this.element.attr("title")}).insertAfter(this.element),this._addClass(this.button,"ui-selectmenu-button ui-selectmenu-button-closed","ui-button ui-widget"),e=t("<span>").appendTo(this.button),this._addClass(e,"ui-selectmenu-icon","ui-icon "+this.options.icons.button),this.buttonItem=this._renderButtonItem(s).appendTo(this.button),this.options.width!==!1&&this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){i._rendered||i._refreshMenu()})},_drawMenu:function(){var e=this;this.menu=t("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=t("<div>").append(this.menu),this._addClass(this.menuWrap,"ui-selectmenu-menu","ui-front"),this.menuWrap.appendTo(this._appendTo()),this.menuInstance=this.menu.menu({classes:{"ui-menu":"ui-corner-bottom"},role:"listbox",select:function(t,i){t.preventDefault(),e._setSelection(),e._select(i.item.data("ui-selectmenu-item"),t)},focus:function(t,i){var s=i.item.data("ui-selectmenu-item");null!=e.focusIndex&&s.index!==e.focusIndex&&(e._trigger("focus",t,{item:s}),e.isOpen||e._select(s,t)),e.focusIndex=s.index,e.button.attr("aria-activedescendant",e.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(this._getSelectedItem().data("ui-selectmenu-item")||{})),null===this.options.width&&this._resizeButton()},_refreshMenu:function(){var t,e=this.element.find("option");this.menu.empty(),this._parseOptions(e),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup").find(".ui-menu-item-wrapper"),this._rendered=!0,e.length&&(t=this._getSelectedItem(),this.menuInstance.focus(null,t),this._setAria(t.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(t){this.options.disabled||(this._rendered?(this._removeClass(this.menu.find(".ui-state-active"),null,"ui-state-active"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.menuItems.length&&(this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",t)))},_position:function(){this.menuWrap.position(t.extend({of:this.button},this.options.position))},close:function(t){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",t))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderButtonItem:function(e){var i=t("<span>");return this._setText(i,e.label),this._addClass(i,"ui-selectmenu-text"),i},_renderMenu:function(e,i){var s=this,n="";t.each(i,function(i,o){var a;o.optgroup!==n&&(a=t("<li>",{text:o.optgroup}),s._addClass(a,"ui-selectmenu-optgroup","ui-menu-divider"+(o.element.parent("optgroup").prop("disabled")?" ui-state-disabled":"")),a.appendTo(e),n=o.optgroup),s._renderItemData(e,o)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-selectmenu-item",e)},_renderItem:function(e,i){var s=t("<li>"),n=t("<div>",{title:i.element.attr("title")});return i.disabled&&this._addClass(s,null,"ui-state-disabled"),this._setText(n,i.label),s.append(n).appendTo(e)},_setText:function(t,e){e?t.text(e):t.html("&#160;")},_move:function(t,e){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex).parent("li"):(i=this.menuItems.eq(this.element[0].selectedIndex).parent("li"),n+=":not(.ui-state-disabled)"),s="first"===t||"last"===t?i["first"===t?"prevAll":"nextAll"](n).eq(-1):i[t+"All"](n).eq(0),s.length&&this.menuInstance.focus(e,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex).parent("li")},_toggle:function(t){this[this.isOpen?"close":"open"](t)},_setSelection:function(){var t;this.range&&(window.getSelection?(t=window.getSelection(),t.removeAllRanges(),t.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(e){this.isOpen&&(t(e.target).closest(".ui-selectmenu-menu, #"+t.ui.escapeSelector(this.ids.button)).length||this.close(e))}},_buttonEvents:{mousedown:function(){var t;window.getSelection?(t=window.getSelection(),t.rangeCount&&(this.range=t.getRangeAt(0))):this.range=document.selection.createRange()},click:function(t){this._setSelection(),this._toggle(t)},keydown:function(e){var i=!0;switch(e.keyCode){case t.ui.keyCode.TAB:case t.ui.keyCode.ESCAPE:this.close(e),i=!1;break;case t.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(e);break;case t.ui.keyCode.UP:e.altKey?this._toggle(e):this._move("prev",e);break;case t.ui.keyCode.DOWN:e.altKey?this._toggle(e):this._move("next",e);break;case t.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(e):this._toggle(e);break;case t.ui.keyCode.LEFT:this._move("prev",e);break;case t.ui.keyCode.RIGHT:this._move("next",e);break;case t.ui.keyCode.HOME:case t.ui.keyCode.PAGE_UP:this._move("first",e);break;case t.ui.keyCode.END:case t.ui.keyCode.PAGE_DOWN:this._move("last",e);break;default:this.menu.trigger(e),i=!1}i&&e.preventDefault()}},_selectFocusedItem:function(t){var e=this.menuItems.eq(this.focusIndex).parent("li");e.hasClass("ui-state-disabled")||this._select(e.data("ui-selectmenu-item"),t)},_select:function(t,e){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=t.index,this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(t)),this._setAria(t),this._trigger("select",e,{item:t}),t.index!==i&&this._trigger("change",e,{item:t}),this.close(e)},_setAria:function(t){var e=this.menuItems.eq(t.index).attr("id");this.button.attr({"aria-labelledby":e,"aria-activedescendant":e}),this.menu.attr("aria-activedescendant",e)},_setOption:function(t,e){if("icons"===t){var i=this.button.find("span.ui-icon");this._removeClass(i,null,this.options.icons.button)._addClass(i,null,e.button)}this._super(t,e),"appendTo"===t&&this.menuWrap.appendTo(this._appendTo()),"width"===t&&this._resizeButton()},_setOptionDisabled:function(t){this._super(t),this.menuInstance.option("disabled",t),this.button.attr("aria-disabled",t),this._toggleClass(this.button,null,"ui-state-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_toggleAttr:function(){this.button.attr("aria-expanded",this.isOpen),this._removeClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"closed":"open"))._addClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"open":"closed"))._toggleClass(this.menuWrap,"ui-selectmenu-open",null,this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var t=this.options.width;return t===!1?(this.button.css("width",""),void 0):(null===t&&(t=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(t),void 0)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){var t=this._super();return t.disabled=this.element.prop("disabled"),t},_parseOptions:function(e){var i=this,s=[];e.each(function(e,n){s.push(i._parseOption(t(n),e))}),this.items=s},_parseOption:function(t,e){var i=t.parent("optgroup");return{element:t,index:e,value:t.val(),label:t.text(),optgroup:i.attr("label")||"",disabled:i.prop("disabled")||t.prop("disabled")}},_destroy:function(){this._unbindFormResetHandler(),this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.labels.attr("for",this.ids.element)}}]),t.widget("ui.slider",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"slide",options:{animate:!1,classes:{"ui-slider":"ui-corner-all","ui-slider-handle":"ui-corner-all","ui-slider-range":"ui-corner-all ui-widget-header"},distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this._addClass("ui-slider ui-slider-"+this.orientation,"ui-widget ui-widget-content"),this._refresh(),this._animateOff=!1
-},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle"),o="<span tabindex='0'></span>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this._addClass(this.handles,"ui-slider-handle","ui-state-default"),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e).attr("tabIndex",0)})},_createRange:function(){var e=this.options;e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?(this._removeClass(this.range,"ui-slider-range-min ui-slider-range-max"),this.range.css({left:"",bottom:""})):(this.range=t("<div>").appendTo(this.element),this._addClass(this.range,"ui-slider-range")),("min"===e.range||"max"===e.range)&&this._addClass(this.range,"ui-slider-range-"+e.range)):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,h,l,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,this._addClass(o,null,"ui-state-active"),o.trigger("focus"),h=o.offset(),l=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:e.pageX-h.left-o.width()/2,top:e.pageY-h.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this._removeClass(this.handles,null,"ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_uiHash:function(t,e,i){var s={handle:this.handles[t],handleIndex:t,value:void 0!==e?e:this.value()};return this._hasMultipleValues()&&(s.value=void 0!==e?e:this.values(t),s.values=i||this.values()),s},_hasMultipleValues:function(){return this.options.values&&this.options.values.length},_start:function(t,e){return this._trigger("start",t,this._uiHash(e))},_slide:function(t,e,i){var s,n,o=this.value(),a=this.values();this._hasMultipleValues()&&(n=this.values(e?0:1),o=this.values(e),2===this.options.values.length&&this.options.range===!0&&(i=0===e?Math.min(n,i):Math.max(n,i)),a[e]=i),i!==o&&(s=this._trigger("slide",t,this._uiHash(e,i,a)),s!==!1&&(this._hasMultipleValues()?this.values(e,i):this.value(i)))},_stop:function(t,e){this._trigger("stop",t,this._uiHash(e))},_change:function(t,e){this._keySliding||this._mouseSliding||(this._lastChangedValue=e,this._trigger("change",t,this._uiHash(e)))},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),void 0;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this._hasMultipleValues()?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),this._super(e,i),e){case"orientation":this._detectOrientation(),this._removeClass("ui-slider-horizontal ui-slider-vertical")._addClass("ui-slider-"+this.orientation),this._refreshValue(),this.options.range&&this._refreshRange(i),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=n-1;s>=0;s--)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_setOptionDisabled:function(t){this._super(t),this._toggleClass(null,"ui-state-disabled",!!t)},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this._hasMultipleValues()){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var t=this.options.max,e=this._valueMin(),i=this.options.step,s=Math.round((t-e)/i)*i;t=s+e,t>this.options.max&&(t-=i),this.max=parseFloat(t.toFixed(this._precision()))},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshRange:function(t){"vertical"===t&&this.range.css({width:"",left:""}),"horizontal"===t&&this.range.css({height:"",bottom:""})},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,c={};this._hasMultipleValues()?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),c["horizontal"===h.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[l?"animate":"css"](c,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:100-i+"%"},r.animate),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:100-i+"%"},r.animate))},_handleEvents:{keydown:function(e){var i,s,n,o,a=t(e.target).data("ui-slider-handle-index");switch(e.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(e.preventDefault(),!this._keySliding&&(this._keySliding=!0,this._addClass(t(e.target),null,"ui-state-active"),i=this._start(e,a),i===!1))return}switch(o=this.options.step,s=n=this._hasMultipleValues()?this.values(a):this.value(),e.keyCode){case t.ui.keyCode.HOME:n=this._valueMin();break;case t.ui.keyCode.END:n=this._valueMax();break;case t.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+o);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-o)}this._slide(e,a,n)},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),this._removeClass(t(e.target),null,"ui-state-active"))}}}),t.widget("ui.sortable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var e=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),t.each(this.items,function(){e._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):void 0}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-this.document.scrollTop()<a.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-a.scrollSpeed):this.window.height()-(e.pageY-this.document.scrollTop())<a.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+a.scrollSpeed)),e.pageX-this.document.scrollLeft()<a.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-a.scrollSpeed):this.window.width()-(e.pageX-this.document.scrollLeft())<a.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new t.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e,i,s="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),n="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),o=s&&n;return o?(e=this._getDragVerticalDirection(),i=this._getDragHorizontalDirection(),this.floating?"right"===i||"down"===e?2:1:e&&("down"===e?2:1)):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],h=[],l=this._connectWith();if(l&&e)for(s=l.length-1;s>=0;s--)for(o=t(l[s],this.document[0]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&h.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(h.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",a),c.push({item:h,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]);return e._addClass(n,"ui-sortable-placeholder",i||e.currentItem[0].className)._removeClass(n,"ui-sortable-helper"),"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("<tr>",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t("<td>&#160;</td>",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,o,a,r,h,l,c,u,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,o=null,c=d.floating||this._isFloating(this.currentItem),a=c?"left":"top",r=c?"width":"height",u=c?"pageX":"pageY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[a],l=!1,e[u]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(e[u]-h)&&(n=Math.abs(e[u]-h),o=this.items[s],this.direction=l?"up":"down"));if(!o&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;o?this._rearrange(e,o,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;
-this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}}),t.widget("ui.spinner",{version:"1.12.1",defaultElement:"<input>",widgetEventPrefix:"spin",options:{classes:{"ui-spinner":"ui-corner-all","ui-spinner-down":"ui-corner-br","ui-spinner-up":"ui-corner-tr"},culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e=this._super(),i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);null!=n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var e=this.element[0]===t.ui.safeActiveElement(this.document[0]);e||(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===t.ui.safeActiveElement(this.document[0])?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap("<span>").parent().append("<a></a><a></a>")},_draw:function(){this._enhance(),this._addClass(this.uiSpinner,"ui-spinner","ui-widget ui-widget-content"),this._addClass("ui-spinner-input"),this.element.attr("role","spinbutton"),this.buttons=this.uiSpinner.children("a").attr("tabIndex",-1).attr("aria-hidden",!0).button({classes:{"ui-button":""}}),this._removeClass(this.buttons,"ui-corner-all"),this._addClass(this.buttons.first(),"ui-spinner-button ui-spinner-up"),this._addClass(this.buttons.last(),"ui-spinner-button ui-spinner-down"),this.buttons.first().button({icon:this.options.icons.up,showLabel:!1}),this.buttons.last().button({icon:this.options.icons.down,showLabel:!1}),this.buttons.height()>Math.ceil(.5*this.uiSpinner.height())&&this.uiSpinner.height()>0&&this.uiSpinner.height(this.uiSpinner.height())},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){var i,s,n;return"culture"===t||"numberFormat"===t?(i=this._parse(this.element.val()),this.options[t]=e,this.element.val(this._format(i)),void 0):(("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(s=this.buttons.first().find(".ui-icon"),this._removeClass(s,null,this.options.icons.up),this._addClass(s,null,e.up),n=this.buttons.last().find(".ui-icon"),this._removeClass(n,null,this.options.icons.down),this._addClass(n,null,e.down)),this._super(t,e),void 0)},_setOptionDisabled:function(t){this._super(t),this._toggleClass(this.uiSpinner,null,"ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable")},_setOptions:r(function(t){this._super(t)}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var t=this.value();return null===t?!1:t===this._adjustValue(t)},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.prop("disabled",!1).removeAttr("autocomplete role aria-valuemin aria-valuemax aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:r(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:r(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:r(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:r(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(r(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),t.uiBackCompat!==!1&&t.widget("ui.spinner",t.ui.spinner,{_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml())},_uiSpinnerHtml:function(){return"<span>"},_buttonHtml:function(){return"<a></a><a></a>"}}),t.ui.spinner,t.widget("ui.tabs",{version:"1.12.1",delay:300,options:{active:null,classes:{"ui-tabs":"ui-corner-all","ui-tabs-nav":"ui-corner-all","ui-tabs-panel":"ui-corner-bottom","ui-tabs-tab":"ui-corner-top"},collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var t=/#.*$/;return function(e){var i,s;i=e.href.replace(t,""),s=location.href.replace(t,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return e.hash.length>1&&i===s}}(),_create:function(){var e=this,i=this.options;this.running=!1,this._addClass("ui-tabs","ui-widget ui-widget-content"),this._toggleClass("ui-tabs-collapsible",null,i.collapsible),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var e=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===e&&(s&&this.tabs.each(function(i,n){return t(n).attr("aria-controls")===s?(e=i,!1):void 0}),null===e&&(e=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===e||-1===e)&&(e=this.tabs.length?0:!1)),e!==!1&&(e=this.tabs.index(this.tabs.eq(e)),-1===e&&(e=i?!1:0)),!i&&e===!1&&this.anchors.length&&(e=0),e},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(e){var i=t(t.ui.safeActiveElement(this.document[0])).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(e)){switch(e.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:s++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:n=!1,s--;break;case t.ui.keyCode.END:s=this.anchors.length-1;break;case t.ui.keyCode.HOME:s=0;break;case t.ui.keyCode.SPACE:return e.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case t.ui.keyCode.ENTER:return e.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}e.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),e.ctrlKey||e.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.trigger("focus"))},_handlePageNav:function(e){return e.altKey&&e.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):e.altKey&&e.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).trigger("focus"),t},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):(this._super(t,e),"collapsible"===t&&(this._toggleClass("ui-tabs-collapsible",null,e),e||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(e),"heightStyle"===t&&this._setupHeightStyle(e),void 0)},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setOptionDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._addClass(this.active,"ui-tabs-active","ui-state-active"),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this,i=this.tabs,s=this.anchors,n=this.panels;this.tablist=this._getList().attr("role","tablist"),this._addClass(this.tablist,"ui-tabs-nav","ui-helper-reset ui-helper-clearfix ui-widget-header"),this.tablist.on("mousedown"+this.eventNamespace,"> li",function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).on("focus"+this.eventNamespace,".ui-tabs-anchor",function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").attr({role:"tab",tabIndex:-1}),this._addClass(this.tabs,"ui-tabs-tab","ui-state-default"),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).attr({role:"presentation",tabIndex:-1}),this._addClass(this.anchors,"ui-tabs-anchor"),this.panels=t(),this.anchors.each(function(i,s){var n,o,a,r=t(s).uniqueId().attr("id"),h=t(s).closest("li"),l=h.attr("aria-controls");e._isLocal(s)?(n=s.hash,a=n.substring(1),o=e.element.find(e._sanitizeSelector(n))):(a=h.attr("aria-controls")||t({}).uniqueId()[0].id,n="#"+a,o=e.element.find(n),o.length||(o=e._createPanel(a),o.insertAfter(e.panels[i-1]||e.tablist)),o.attr("aria-live","polite")),o.length&&(e.panels=e.panels.add(o)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":a,"aria-labelledby":r}),o.attr("aria-labelledby",r)}),this.panels.attr("role","tabpanel"),this._addClass(this.panels,"ui-tabs-panel","ui-widget-content"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol, ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).data("ui-tabs-destroy",!0)},_setOptionDisabled:function(e){var i,s,n;for(t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1),n=0;s=this.tabs[n];n++)i=t(s),e===!0||-1!==t.inArray(n,e)?(i.attr("aria-disabled","true"),this._addClass(i,null,"ui-state-disabled")):(i.removeAttr("aria-disabled"),this._removeClass(i,null,"ui-state-disabled"));this.options.disabled=e,this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,e===!0)},_setupEvents:function(e){var i={};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(t){t.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,h=r?t():this._getPanelForTab(o),l=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:l,newTab:r?t():o,newPanel:h};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),l.length||h.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){o._addClass(i.newTab.closest("li"),"ui-tabs-active","ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){o._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),n()}):(this._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+t.ui.escapeSelector(e)+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.tablist.removeAttr("role").off(this.eventNamespace),this.anchors.removeAttr("role tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeAttr("role tabIndex aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(e){var i=this.options.disabled;i!==!1&&(void 0===e?i=!1:(e=this._getIndex(e),i=t.isArray(i)?t.map(i,function(t){return t!==e?t:null}):t.map(this.tabs,function(t,i){return i!==e?i:null})),this._setOptionDisabled(i))},disable:function(e){var i=this.options.disabled;if(i!==!0){if(void 0===e)i=!0;else{if(e=this._getIndex(e),-1!==t.inArray(e,i))return;i=t.isArray(i)?t.merge([e],i).sort():[e]}this._setOptionDisabled(i)}},load:function(e,i){e=this._getIndex(e);var s=this,n=this.tabs.eq(e),o=n.find(".ui-tabs-anchor"),a=this._getPanelForTab(n),r={tab:n,panel:a},h=function(t,e){"abort"===e&&s.panels.stop(!1,!0),s._removeClass(n,"ui-tabs-loading"),a.removeAttr("aria-busy"),t===s.xhr&&delete s.xhr};this._isLocal(o[0])||(this.xhr=t.ajax(this._ajaxSettings(o,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(this._addClass(n,"ui-tabs-loading"),a.attr("aria-busy","true"),this.xhr.done(function(t,e,n){setTimeout(function(){a.html(t),s._trigger("load",i,r),h(n,e)},1)}).fail(function(t,e){setTimeout(function(){h(t,e)},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href").replace(/#.*$/,""),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),t.uiBackCompat!==!1&&t.widget("ui.tabs",t.ui.tabs,{_processTabs:function(){this._superApply(arguments),this._addClass(this.tabs,"ui-tab")}}),t.ui.tabs,t.widget("ui.tooltip",{version:"1.12.1",options:{classes:{"ui-tooltip":"ui-corner-all ui-widget-shadow"},content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,track:!1,close:null,open:null},_addDescribedBy:function(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))},_removeDescribedBy:function(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.liveRegion=t("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this.disabledTitles=t([])},_setOption:function(e,i){var s=this;this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e.element)})},_setOptionDisabled:function(t){this[t?"_disable":"_enable"]()},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s.element[0],e.close(n,!0)}),this.disabledTitles=this.disabledTitles.add(this.element.find(this.options.items).addBack().filter(function(){var e=t(this);return e.is("[title]")?e.data("ui-tooltip-title",e.attr("title")).removeAttr("title"):void 0}))},_enable:function(){this.disabledTitles.each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))}),this.disabledTitles=t([])},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(e,s),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;return"string"==typeof s||s.nodeType||s.jquery?this._open(e,t,s):(i=s.call(t[0],function(i){n._delay(function(){t.data("ui-tooltip-open")&&(e&&(e.type=o),this._open(e,t,i))})}),i&&this._open(e,t,i),void 0)},_open:function(e,i,s){function n(t){l.of=t,a.is(":hidden")||a.position(l)}var o,a,r,h,l=t.extend({},this.options.position);if(s){if(o=this._find(i))return o.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(e&&"mouseover"===e.type?i.attr("title",""):i.removeAttr("title")),o=this._tooltip(i),a=o.tooltip,this._addDescribedBy(i,a.attr("id")),a.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),h=t("<div>").html(a.find(".ui-tooltip-content").html()),h.removeAttr("name").find("[name]").removeAttr("name"),h.removeAttr("id").find("[id]").removeAttr("id"),h.appendTo(this.liveRegion),this.options.track&&e&&/^mouse/.test(e.type)?(this._on(this.document,{mousemove:n}),n(e)):a.position(t.extend({of:i},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.track&&this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){a.is(":visible")&&(n(l.of),clearInterval(r))},t.fx.interval)),this._trigger("open",e,{tooltip:a})}},_registerCloseHandlers:function(e,i){var s={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var s=t.Event(e);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),e&&"mouseover"!==e.type||(s.mouseleave="close"),e&&"focusin"!==e.type||(s.focusout="close"),this._on(!0,i,s)},close:function(e){var i,s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);return o?(i=o.tooltip,o.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),o.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]}),o.closing=!0,this._trigger("close",e,{tooltip:i}),o.hiding||(o.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(e){var i=t("<div>").attr("role","tooltip"),s=t("<div>").appendTo(i),n=i.uniqueId().attr("id");return this._addClass(s,"ui-tooltip-content"),this._addClass(i,"ui-tooltip","ui-widget ui-widget-content"),i.appendTo(this._appendTo(e)),this.tooltips[n]={element:e,tooltip:i}},_find:function(t){var e=t.data("ui-tooltip-id");return e?this.tooltips[e]:null},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_appendTo:function(t){var e=t.closest(".ui-front, dialog");return e.length||(e=this.document[0].body),e},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur"),o=s.element;n.target=n.currentTarget=o[0],e.close(n,!0),t("#"+i).remove(),o.data("ui-tooltip-title")&&(o.attr("title")||o.attr("title",o.data("ui-tooltip-title")),o.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),t.uiBackCompat!==!1&&t.widget("ui.tooltip",t.ui.tooltip,{options:{tooltipClass:null},_tooltip:function(){var t=this._superApply(arguments);return this.options.tooltipClass&&t.tooltip.addClass(this.options.tooltipClass),t}}),t.ui.tooltip});
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.structure.css b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.structure.css
deleted file mode 100644
index 9e6955a09..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.structure.css
+++ /dev/null
@@ -1,886 +0,0 @@
-/*!
- * jQuery UI CSS Framework 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/category/theming/
- */
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden {
-	display: none;
-}
-.ui-helper-hidden-accessible {
-	border: 0;
-	clip: rect(0 0 0 0);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	width: 1px;
-}
-.ui-helper-reset {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	line-height: 1.3;
-	text-decoration: none;
-	font-size: 100%;
-	list-style: none;
-}
-.ui-helper-clearfix:before,
-.ui-helper-clearfix:after {
-	content: "";
-	display: table;
-	border-collapse: collapse;
-}
-.ui-helper-clearfix:after {
-	clear: both;
-}
-.ui-helper-zfix {
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	position: absolute;
-	opacity: 0;
-	filter:Alpha(Opacity=0); /* support: IE8 */
-}
-
-.ui-front {
-	z-index: 100;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled {
-	cursor: default !important;
-	pointer-events: none;
-}
-
-
-/* Icons
-----------------------------------*/
-.ui-icon {
-	display: inline-block;
-	vertical-align: middle;
-	margin-top: -.25em;
-	position: relative;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-}
-
-.ui-widget-icon-block {
-	left: 50%;
-	margin-left: -8px;
-	display: block;
-}
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-.ui-accordion .ui-accordion-header {
-	display: block;
-	cursor: pointer;
-	position: relative;
-	margin: 2px 0 0 0;
-	padding: .5em .5em .5em .7em;
-	font-size: 100%;
-}
-.ui-accordion .ui-accordion-content {
-	padding: 1em 2.2em;
-	border-top: 0;
-	overflow: auto;
-}
-.ui-autocomplete {
-	position: absolute;
-	top: 0;
-	left: 0;
-	cursor: default;
-}
-.ui-menu {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-	display: block;
-	outline: 0;
-}
-.ui-menu .ui-menu {
-	position: absolute;
-}
-.ui-menu .ui-menu-item {
-	margin: 0;
-	cursor: pointer;
-	/* support: IE10, see #8844 */
-	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
-}
-.ui-menu .ui-menu-item-wrapper {
-	position: relative;
-	padding: 3px 1em 3px .4em;
-}
-.ui-menu .ui-menu-divider {
-	margin: 5px 0;
-	height: 0;
-	font-size: 0;
-	line-height: 0;
-	border-width: 1px 0 0 0;
-}
-.ui-menu .ui-state-focus,
-.ui-menu .ui-state-active {
-	margin: -1px;
-}
-
-/* icon support */
-.ui-menu-icons {
-	position: relative;
-}
-.ui-menu-icons .ui-menu-item-wrapper {
-	padding-left: 2em;
-}
-
-/* left-aligned */
-.ui-menu .ui-icon {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: .2em;
-	margin: auto 0;
-}
-
-/* right-aligned */
-.ui-menu .ui-menu-icon {
-	left: auto;
-	right: 0;
-}
-.ui-button {
-	padding: .4em 1em;
-	display: inline-block;
-	position: relative;
-	line-height: normal;
-	margin-right: .1em;
-	cursor: pointer;
-	vertical-align: middle;
-	text-align: center;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-
-	/* Support: IE <= 11 */
-	overflow: visible;
-}
-
-.ui-button,
-.ui-button:link,
-.ui-button:visited,
-.ui-button:hover,
-.ui-button:active {
-	text-decoration: none;
-}
-
-/* to make room for the icon, a width needs to be set here */
-.ui-button-icon-only {
-	width: 2em;
-	box-sizing: border-box;
-	text-indent: -9999px;
-	white-space: nowrap;
-}
-
-/* no icon support for input elements */
-input.ui-button.ui-button-icon-only {
-	text-indent: 0;
-}
-
-/* button icon element(s) */
-.ui-button-icon-only .ui-icon {
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	margin-top: -8px;
-	margin-left: -8px;
-}
-
-.ui-button.ui-icon-notext .ui-icon {
-	padding: 0;
-	width: 2.1em;
-	height: 2.1em;
-	text-indent: -9999px;
-	white-space: nowrap;
-
-}
-
-input.ui-button.ui-icon-notext .ui-icon {
-	width: auto;
-	height: auto;
-	text-indent: 0;
-	white-space: normal;
-	padding: .4em 1em;
-}
-
-/* workarounds */
-/* Support: Firefox 5 - 40 */
-input.ui-button::-moz-focus-inner,
-button.ui-button::-moz-focus-inner {
-	border: 0;
-	padding: 0;
-}
-.ui-controlgroup {
-	vertical-align: middle;
-	display: inline-block;
-}
-.ui-controlgroup > .ui-controlgroup-item {
-	float: left;
-	margin-left: 0;
-	margin-right: 0;
-}
-.ui-controlgroup > .ui-controlgroup-item:focus,
-.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus {
-	z-index: 9999;
-}
-.ui-controlgroup-vertical > .ui-controlgroup-item {
-	display: block;
-	float: none;
-	width: 100%;
-	margin-top: 0;
-	margin-bottom: 0;
-	text-align: left;
-}
-.ui-controlgroup-vertical .ui-controlgroup-item {
-	box-sizing: border-box;
-}
-.ui-controlgroup .ui-controlgroup-label {
-	padding: .4em 1em;
-}
-.ui-controlgroup .ui-controlgroup-label span {
-	font-size: 80%;
-}
-.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item {
-	border-left: none;
-}
-.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item {
-	border-top: none;
-}
-.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content {
-	border-right: none;
-}
-.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content {
-	border-bottom: none;
-}
-
-/* Spinner specific style fixes */
-.ui-controlgroup-vertical .ui-spinner-input {
-
-	/* Support: IE8 only, Android < 4.4 only */
-	width: 75%;
-	width: calc( 100% - 2.4em );
-}
-.ui-controlgroup-vertical .ui-spinner .ui-spinner-up {
-	border-top-style: solid;
-}
-
-.ui-checkboxradio-label .ui-icon-background {
-	box-shadow: inset 1px 1px 1px #ccc;
-	border-radius: .12em;
-	border: none;
-}
-.ui-checkboxradio-radio-label .ui-icon-background {
-	width: 16px;
-	height: 16px;
-	border-radius: 1em;
-	overflow: visible;
-	border: none;
-}
-.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,
-.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon {
-	background-image: none;
-	width: 8px;
-	height: 8px;
-	border-width: 4px;
-	border-style: solid;
-}
-.ui-checkboxradio-disabled {
-	pointer-events: none;
-}
-.ui-datepicker {
-	width: 17em;
-	padding: .2em .2em 0;
-	display: none;
-}
-.ui-datepicker .ui-datepicker-header {
-	position: relative;
-	padding: .2em 0;
-}
-.ui-datepicker .ui-datepicker-prev,
-.ui-datepicker .ui-datepicker-next {
-	position: absolute;
-	top: 2px;
-	width: 1.8em;
-	height: 1.8em;
-}
-.ui-datepicker .ui-datepicker-prev-hover,
-.ui-datepicker .ui-datepicker-next-hover {
-	top: 1px;
-}
-.ui-datepicker .ui-datepicker-prev {
-	left: 2px;
-}
-.ui-datepicker .ui-datepicker-next {
-	right: 2px;
-}
-.ui-datepicker .ui-datepicker-prev-hover {
-	left: 1px;
-}
-.ui-datepicker .ui-datepicker-next-hover {
-	right: 1px;
-}
-.ui-datepicker .ui-datepicker-prev span,
-.ui-datepicker .ui-datepicker-next span {
-	display: block;
-	position: absolute;
-	left: 50%;
-	margin-left: -8px;
-	top: 50%;
-	margin-top: -8px;
-}
-.ui-datepicker .ui-datepicker-title {
-	margin: 0 2.3em;
-	line-height: 1.8em;
-	text-align: center;
-}
-.ui-datepicker .ui-datepicker-title select {
-	font-size: 1em;
-	margin: 1px 0;
-}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year {
-	width: 45%;
-}
-.ui-datepicker table {
-	width: 100%;
-	font-size: .9em;
-	border-collapse: collapse;
-	margin: 0 0 .4em;
-}
-.ui-datepicker th {
-	padding: .7em .3em;
-	text-align: center;
-	font-weight: bold;
-	border: 0;
-}
-.ui-datepicker td {
-	border: 0;
-	padding: 1px;
-}
-.ui-datepicker td span,
-.ui-datepicker td a {
-	display: block;
-	padding: .2em;
-	text-align: right;
-	text-decoration: none;
-}
-.ui-datepicker .ui-datepicker-buttonpane {
-	background-image: none;
-	margin: .7em 0 0 0;
-	padding: 0 .2em;
-	border-left: 0;
-	border-right: 0;
-	border-bottom: 0;
-}
-.ui-datepicker .ui-datepicker-buttonpane button {
-	float: right;
-	margin: .5em .2em .4em;
-	cursor: pointer;
-	padding: .2em .6em .3em .6em;
-	width: auto;
-	overflow: visible;
-}
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
-	float: left;
-}
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi {
-	width: auto;
-}
-.ui-datepicker-multi .ui-datepicker-group {
-	float: left;
-}
-.ui-datepicker-multi .ui-datepicker-group table {
-	width: 95%;
-	margin: 0 auto .4em;
-}
-.ui-datepicker-multi-2 .ui-datepicker-group {
-	width: 50%;
-}
-.ui-datepicker-multi-3 .ui-datepicker-group {
-	width: 33.3%;
-}
-.ui-datepicker-multi-4 .ui-datepicker-group {
-	width: 25%;
-}
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
-	border-left-width: 0;
-}
-.ui-datepicker-multi .ui-datepicker-buttonpane {
-	clear: left;
-}
-.ui-datepicker-row-break {
-	clear: both;
-	width: 100%;
-	font-size: 0;
-}
-
-/* RTL support */
-.ui-datepicker-rtl {
-	direction: rtl;
-}
-.ui-datepicker-rtl .ui-datepicker-prev {
-	right: 2px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next {
-	left: 2px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-prev:hover {
-	right: 1px;
-	left: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-next:hover {
-	left: 1px;
-	right: auto;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane {
-	clear: right;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button {
-	float: left;
-}
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
-.ui-datepicker-rtl .ui-datepicker-group {
-	float: right;
-}
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
-	border-right-width: 0;
-	border-left-width: 1px;
-}
-
-/* Icons */
-.ui-datepicker .ui-icon {
-	display: block;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-	left: .5em;
-	top: .3em;
-}
-.ui-dialog {
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: .2em;
-	outline: 0;
-}
-.ui-dialog .ui-dialog-titlebar {
-	padding: .4em 1em;
-	position: relative;
-}
-.ui-dialog .ui-dialog-title {
-	float: left;
-	margin: .1em 0;
-	white-space: nowrap;
-	width: 90%;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.ui-dialog .ui-dialog-titlebar-close {
-	position: absolute;
-	right: .3em;
-	top: 50%;
-	width: 20px;
-	margin: -10px 0 0 0;
-	padding: 1px;
-	height: 20px;
-}
-.ui-dialog .ui-dialog-content {
-	position: relative;
-	border: 0;
-	padding: .5em 1em;
-	background: none;
-	overflow: auto;
-}
-.ui-dialog .ui-dialog-buttonpane {
-	text-align: left;
-	border-width: 1px 0 0 0;
-	background-image: none;
-	margin-top: .5em;
-	padding: .3em 1em .5em .4em;
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: right;
-}
-.ui-dialog .ui-dialog-buttonpane button {
-	margin: .5em .4em .5em 0;
-	cursor: pointer;
-}
-.ui-dialog .ui-resizable-n {
-	height: 2px;
-	top: 0;
-}
-.ui-dialog .ui-resizable-e {
-	width: 2px;
-	right: 0;
-}
-.ui-dialog .ui-resizable-s {
-	height: 2px;
-	bottom: 0;
-}
-.ui-dialog .ui-resizable-w {
-	width: 2px;
-	left: 0;
-}
-.ui-dialog .ui-resizable-se,
-.ui-dialog .ui-resizable-sw,
-.ui-dialog .ui-resizable-ne,
-.ui-dialog .ui-resizable-nw {
-	width: 7px;
-	height: 7px;
-}
-.ui-dialog .ui-resizable-se {
-	right: 0;
-	bottom: 0;
-}
-.ui-dialog .ui-resizable-sw {
-	left: 0;
-	bottom: 0;
-}
-.ui-dialog .ui-resizable-ne {
-	right: 0;
-	top: 0;
-}
-.ui-dialog .ui-resizable-nw {
-	left: 0;
-	top: 0;
-}
-.ui-draggable .ui-dialog-titlebar {
-	cursor: move;
-}
-.ui-draggable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-resizable {
-	position: relative;
-}
-.ui-resizable-handle {
-	position: absolute;
-	font-size: 0.1px;
-	display: block;
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-resizable-disabled .ui-resizable-handle,
-.ui-resizable-autohide .ui-resizable-handle {
-	display: none;
-}
-.ui-resizable-n {
-	cursor: n-resize;
-	height: 7px;
-	width: 100%;
-	top: -5px;
-	left: 0;
-}
-.ui-resizable-s {
-	cursor: s-resize;
-	height: 7px;
-	width: 100%;
-	bottom: -5px;
-	left: 0;
-}
-.ui-resizable-e {
-	cursor: e-resize;
-	width: 7px;
-	right: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-w {
-	cursor: w-resize;
-	width: 7px;
-	left: -5px;
-	top: 0;
-	height: 100%;
-}
-.ui-resizable-se {
-	cursor: se-resize;
-	width: 12px;
-	height: 12px;
-	right: 1px;
-	bottom: 1px;
-}
-.ui-resizable-sw {
-	cursor: sw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	bottom: -5px;
-}
-.ui-resizable-nw {
-	cursor: nw-resize;
-	width: 9px;
-	height: 9px;
-	left: -5px;
-	top: -5px;
-}
-.ui-resizable-ne {
-	cursor: ne-resize;
-	width: 9px;
-	height: 9px;
-	right: -5px;
-	top: -5px;
-}
-.ui-progressbar {
-	height: 2em;
-	text-align: left;
-	overflow: hidden;
-}
-.ui-progressbar .ui-progressbar-value {
-	margin: -1px;
-	height: 100%;
-}
-.ui-progressbar .ui-progressbar-overlay {
-	background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
-	height: 100%;
-	filter: alpha(opacity=25); /* support: IE8 */
-	opacity: 0.25;
-}
-.ui-progressbar-indeterminate .ui-progressbar-value {
-	background-image: none;
-}
-.ui-selectable {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-selectable-helper {
-	position: absolute;
-	z-index: 100;
-	border: 1px dotted black;
-}
-.ui-selectmenu-menu {
-	padding: 0;
-	margin: 0;
-	position: absolute;
-	top: 0;
-	left: 0;
-	display: none;
-}
-.ui-selectmenu-menu .ui-menu {
-	overflow: auto;
-	overflow-x: hidden;
-	padding-bottom: 1px;
-}
-.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup {
-	font-size: 1em;
-	font-weight: bold;
-	line-height: 1.5;
-	padding: 2px 0.4em;
-	margin: 0.5em 0 0 0;
-	height: auto;
-	border: 0;
-}
-.ui-selectmenu-open {
-	display: block;
-}
-.ui-selectmenu-text {
-	display: block;
-	margin-right: 20px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.ui-selectmenu-button.ui-button {
-	text-align: left;
-	white-space: nowrap;
-	width: 14em;
-}
-.ui-selectmenu-icon.ui-icon {
-	float: right;
-	margin-top: 0;
-}
-.ui-slider {
-	position: relative;
-	text-align: left;
-}
-.ui-slider .ui-slider-handle {
-	position: absolute;
-	z-index: 2;
-	width: 1.2em;
-	height: 1.2em;
-	cursor: default;
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-slider .ui-slider-range {
-	position: absolute;
-	z-index: 1;
-	font-size: .7em;
-	display: block;
-	border: 0;
-	background-position: 0 0;
-}
-
-/* support: IE8 - See #6727 */
-.ui-slider.ui-state-disabled .ui-slider-handle,
-.ui-slider.ui-state-disabled .ui-slider-range {
-	filter: inherit;
-}
-
-.ui-slider-horizontal {
-	height: .8em;
-}
-.ui-slider-horizontal .ui-slider-handle {
-	top: -.3em;
-	margin-left: -.6em;
-}
-.ui-slider-horizontal .ui-slider-range {
-	top: 0;
-	height: 100%;
-}
-.ui-slider-horizontal .ui-slider-range-min {
-	left: 0;
-}
-.ui-slider-horizontal .ui-slider-range-max {
-	right: 0;
-}
-
-.ui-slider-vertical {
-	width: .8em;
-	height: 100px;
-}
-.ui-slider-vertical .ui-slider-handle {
-	left: -.3em;
-	margin-left: 0;
-	margin-bottom: -.6em;
-}
-.ui-slider-vertical .ui-slider-range {
-	left: 0;
-	width: 100%;
-}
-.ui-slider-vertical .ui-slider-range-min {
-	bottom: 0;
-}
-.ui-slider-vertical .ui-slider-range-max {
-	top: 0;
-}
-.ui-sortable-handle {
-	-ms-touch-action: none;
-	touch-action: none;
-}
-.ui-spinner {
-	position: relative;
-	display: inline-block;
-	overflow: hidden;
-	padding: 0;
-	vertical-align: middle;
-}
-.ui-spinner-input {
-	border: none;
-	background: none;
-	color: inherit;
-	padding: .222em 0;
-	margin: .2em 0;
-	vertical-align: middle;
-	margin-left: .4em;
-	margin-right: 2em;
-}
-.ui-spinner-button {
-	width: 1.6em;
-	height: 50%;
-	font-size: .5em;
-	padding: 0;
-	margin: 0;
-	text-align: center;
-	position: absolute;
-	cursor: default;
-	display: block;
-	overflow: hidden;
-	right: 0;
-}
-/* more specificity required here to override default borders */
-.ui-spinner a.ui-spinner-button {
-	border-top-style: none;
-	border-bottom-style: none;
-	border-right-style: none;
-}
-.ui-spinner-up {
-	top: 0;
-}
-.ui-spinner-down {
-	bottom: 0;
-}
-.ui-tabs {
-	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-	padding: .2em;
-}
-.ui-tabs .ui-tabs-nav {
-	margin: 0;
-	padding: .2em .2em 0;
-}
-.ui-tabs .ui-tabs-nav li {
-	list-style: none;
-	float: left;
-	position: relative;
-	top: 0;
-	margin: 1px .2em 0 0;
-	border-bottom-width: 0;
-	padding: 0;
-	white-space: nowrap;
-}
-.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
-	float: left;
-	padding: .5em 1em;
-	text-decoration: none;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active {
-	margin-bottom: -1px;
-	padding-bottom: 1px;
-}
-.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
-.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
-	cursor: text;
-}
-.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
-	cursor: pointer;
-}
-.ui-tabs .ui-tabs-panel {
-	display: block;
-	border-width: 0;
-	padding: 1em 1.4em;
-	background: none;
-}
-.ui-tooltip {
-	padding: 8px;
-	position: absolute;
-	z-index: 9999;
-	max-width: 300px;
-}
-body .ui-tooltip {
-	border-width: 2px;
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.structure.min.css b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.structure.min.css
deleted file mode 100644
index 1e80c4db1..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.structure.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery UI - v1.12.1 - 2016-09-14
-* http://jqueryui.com
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important;pointer-events:none}.ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin:2px 0 0 0;padding:.5em .5em .5em .7em;font-size:100%}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:0}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{margin:0;cursor:pointer;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-item-wrapper{position:relative;padding:3px 1em 3px .4em}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item-wrapper{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-button{padding:.4em 1em;display:inline-block;position:relative;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2em;box-sizing:border-box;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-button-icon-only{text-indent:0}.ui-button-icon-only .ui-icon{position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}.ui-button.ui-icon-notext .ui-icon{padding:0;width:2.1em;height:2.1em;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-icon-notext .ui-icon{width:auto;height:auto;text-indent:0;white-space:normal;padding:.4em 1em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-controlgroup{vertical-align:middle;display:inline-block}.ui-controlgroup > .ui-controlgroup-item{float:left;margin-left:0;margin-right:0}.ui-controlgroup > .ui-controlgroup-item:focus,.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus{z-index:9999}.ui-controlgroup-vertical > .ui-controlgroup-item{display:block;float:none;width:100%;margin-top:0;margin-bottom:0;text-align:left}.ui-controlgroup-vertical .ui-controlgroup-item{box-sizing:border-box}.ui-controlgroup .ui-controlgroup-label{padding:.4em 1em}.ui-controlgroup .ui-controlgroup-label span{font-size:80%}.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item{border-left:none}.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item{border-top:none}.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content{border-right:none}.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content{border-bottom:none}.ui-controlgroup-vertical .ui-spinner-input{width:75%;width:calc( 100% - 2.4em )}.ui-controlgroup-vertical .ui-spinner .ui-spinner-up{border-top-style:solid}.ui-checkboxradio-label .ui-icon-background{box-shadow:inset 1px 1px 1px #ccc;border-radius:.12em;border:none}.ui-checkboxradio-radio-label .ui-icon-background{width:16px;height:16px;border-radius:1em;overflow:visible;border:none}.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon{background-image:none;width:8px;height:8px;border-width:4px;border-style:solid}.ui-checkboxradio-disabled{pointer-events:none}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-datepicker .ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat;left:.5em;top:.3em}.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-n{height:2px;top:0}.ui-dialog .ui-resizable-e{width:2px;right:0}.ui-dialog .ui-resizable-s{height:2px;bottom:0}.ui-dialog .ui-resizable-w{width:2px;left:0}.ui-dialog .ui-resizable-se,.ui-dialog .ui-resizable-sw,.ui-dialog .ui-resizable-ne,.ui-dialog .ui-resizable-nw{width:7px;height:7px}.ui-dialog .ui-resizable-se{right:0;bottom:0}.ui-dialog .ui-resizable-sw{left:0;bottom:0}.ui-dialog .ui-resizable-ne{right:0;top:0}.ui-dialog .ui-resizable-nw{left:0;top:0}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");height:100%;filter:alpha(opacity=25);opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:bold;line-height:1.5;padding:2px 0.4em;margin:0.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-text{display:block;margin-right:20px;overflow:hidden;text-overflow:ellipsis}.ui-selectmenu-button.ui-button{text-align:left;white-space:nowrap;width:14em}.ui-selectmenu-icon.ui-icon{float:right;margin-top:0}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default;-ms-touch-action:none;touch-action:none}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:.222em 0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:2em}.ui-spinner-button{width:1.6em;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top-style:none;border-bottom-style:none;border-right-style:none}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px}body .ui-tooltip{border-width:2px}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.theme.css b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.theme.css
deleted file mode 100644
index 6089438c9..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.theme.css
+++ /dev/null
@@ -1,443 +0,0 @@
-/*!
- * jQuery UI CSS Framework 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/category/theming/
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?bgShadowXPos=&bgOverlayXPos=&bgErrorXPos=&bgHighlightXPos=&bgContentXPos=&bgHeaderXPos=&bgActiveXPos=&bgHoverXPos=&bgDefaultXPos=&bgShadowYPos=&bgOverlayYPos=&bgErrorYPos=&bgHighlightYPos=&bgContentYPos=&bgHeaderYPos=&bgActiveYPos=&bgHoverYPos=&bgDefaultYPos=&bgShadowRepeat=&bgOverlayRepeat=&bgErrorRepeat=&bgHighlightRepeat=&bgContentRepeat=&bgHeaderRepeat=&bgActiveRepeat=&bgHoverRepeat=&bgDefaultRepeat=&iconsHover=url(%22images%2Fui-icons_555555_256x240.png%22)&iconsHighlight=url(%22images%2Fui-icons_777620_256x240.png%22)&iconsHeader=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsError=url(%22images%2Fui-icons_cc0000_256x240.png%22)&iconsDefault=url(%22images%2Fui-icons_777777_256x240.png%22)&iconsContent=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsActive=url(%22images%2Fui-icons_ffffff_256x240.png%22)&bgImgUrlShadow=&bgImgUrlOverlay=&bgImgUrlHover=&bgImgUrlHighlight=&bgImgUrlHeader=&bgImgUrlError=&bgImgUrlDefault=&bgImgUrlContent=&bgImgUrlActive=&opacityFilterShadow=Alpha(Opacity%3D30)&opacityFilterOverlay=Alpha(Opacity%3D30)&opacityShadowPerc=30&opacityOverlayPerc=30&iconColorHover=%23555555&iconColorHighlight=%23777620&iconColorHeader=%23444444&iconColorError=%23cc0000&iconColorDefault=%23777777&iconColorContent=%23444444&iconColorActive=%23ffffff&bgImgOpacityShadow=0&bgImgOpacityOverlay=0&bgImgOpacityError=95&bgImgOpacityHighlight=55&bgImgOpacityContent=75&bgImgOpacityHeader=75&bgImgOpacityActive=65&bgImgOpacityHover=75&bgImgOpacityDefault=75&bgTextureShadow=flat&bgTextureOverlay=flat&bgTextureError=flat&bgTextureHighlight=flat&bgTextureContent=flat&bgTextureHeader=flat&bgTextureActive=flat&bgTextureHover=flat&bgTextureDefault=flat&cornerRadius=3px&fwDefault=normal&ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&cornerRadiusShadow=8px&thicknessShadow=5px&offsetLeftShadow=0px&offsetTopShadow=0px&opacityShadow=.3&bgColorShadow=%23666666&opacityOverlay=.3&bgColorOverlay=%23aaaaaa&fcError=%235f3f3f&borderColorError=%23f1a899&bgColorError=%23fddfdf&fcHighlight=%23777620&borderColorHighlight=%23dad55e&bgColorHighlight=%23fffa90&fcContent=%23333333&borderColorContent=%23dddddd&bgColorContent=%23ffffff&fcHeader=%23333333&borderColorHeader=%23dddddd&bgColorHeader=%23e9e9e9&fcActive=%23ffffff&borderColorActive=%23003eff&bgColorActive=%23007fff&fcHover=%232b2b2b&borderColorHover=%23cccccc&bgColorHover=%23ededed&fcDefault=%23454545&borderColorDefault=%23c5c5c5&bgColorDefault=%23f6f6f6
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget {
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 1em;
-}
-.ui-widget .ui-widget {
-	font-size: 1em;
-}
-.ui-widget input,
-.ui-widget select,
-.ui-widget textarea,
-.ui-widget button {
-	font-family: Arial,Helvetica,sans-serif;
-	font-size: 1em;
-}
-.ui-widget.ui-widget-content {
-	border: 1px solid #c5c5c5;
-}
-.ui-widget-content {
-	border: 1px solid #dddddd;
-	background: #ffffff;
-	color: #333333;
-}
-.ui-widget-content a {
-	color: #333333;
-}
-.ui-widget-header {
-	border: 1px solid #dddddd;
-	background: #e9e9e9;
-	color: #333333;
-	font-weight: bold;
-}
-.ui-widget-header a {
-	color: #333333;
-}
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default,
-.ui-widget-content .ui-state-default,
-.ui-widget-header .ui-state-default,
-.ui-button,
-
-/* We use html here because we need a greater specificity to make sure disabled
-works properly when clicked or hovered */
-html .ui-button.ui-state-disabled:hover,
-html .ui-button.ui-state-disabled:active {
-	border: 1px solid #c5c5c5;
-	background: #f6f6f6;
-	font-weight: normal;
-	color: #454545;
-}
-.ui-state-default a,
-.ui-state-default a:link,
-.ui-state-default a:visited,
-a.ui-button,
-a:link.ui-button,
-a:visited.ui-button,
-.ui-button {
-	color: #454545;
-	text-decoration: none;
-}
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus,
-.ui-button:hover,
-.ui-button:focus {
-	border: 1px solid #cccccc;
-	background: #ededed;
-	font-weight: normal;
-	color: #2b2b2b;
-}
-.ui-state-hover a,
-.ui-state-hover a:hover,
-.ui-state-hover a:link,
-.ui-state-hover a:visited,
-.ui-state-focus a,
-.ui-state-focus a:hover,
-.ui-state-focus a:link,
-.ui-state-focus a:visited,
-a.ui-button:hover,
-a.ui-button:focus {
-	color: #2b2b2b;
-	text-decoration: none;
-}
-
-.ui-visual-focus {
-	box-shadow: 0 0 3px 1px rgb(94, 158, 214);
-}
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active,
-a.ui-button:active,
-.ui-button:active,
-.ui-button.ui-state-active:hover {
-	border: 1px solid #003eff;
-	background: #007fff;
-	font-weight: normal;
-	color: #ffffff;
-}
-.ui-icon-background,
-.ui-state-active .ui-icon-background {
-	border: #003eff;
-	background-color: #ffffff;
-}
-.ui-state-active a,
-.ui-state-active a:link,
-.ui-state-active a:visited {
-	color: #ffffff;
-	text-decoration: none;
-}
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight,
-.ui-widget-content .ui-state-highlight,
-.ui-widget-header .ui-state-highlight {
-	border: 1px solid #dad55e;
-	background: #fffa90;
-	color: #777620;
-}
-.ui-state-checked {
-	border: 1px solid #dad55e;
-	background: #fffa90;
-}
-.ui-state-highlight a,
-.ui-widget-content .ui-state-highlight a,
-.ui-widget-header .ui-state-highlight a {
-	color: #777620;
-}
-.ui-state-error,
-.ui-widget-content .ui-state-error,
-.ui-widget-header .ui-state-error {
-	border: 1px solid #f1a899;
-	background: #fddfdf;
-	color: #5f3f3f;
-}
-.ui-state-error a,
-.ui-widget-content .ui-state-error a,
-.ui-widget-header .ui-state-error a {
-	color: #5f3f3f;
-}
-.ui-state-error-text,
-.ui-widget-content .ui-state-error-text,
-.ui-widget-header .ui-state-error-text {
-	color: #5f3f3f;
-}
-.ui-priority-primary,
-.ui-widget-content .ui-priority-primary,
-.ui-widget-header .ui-priority-primary {
-	font-weight: bold;
-}
-.ui-priority-secondary,
-.ui-widget-content .ui-priority-secondary,
-.ui-widget-header .ui-priority-secondary {
-	opacity: .7;
-	filter:Alpha(Opacity=70); /* support: IE8 */
-	font-weight: normal;
-}
-.ui-state-disabled,
-.ui-widget-content .ui-state-disabled,
-.ui-widget-header .ui-state-disabled {
-	opacity: .35;
-	filter:Alpha(Opacity=35); /* support: IE8 */
-	background-image: none;
-}
-.ui-state-disabled .ui-icon {
-	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
-}
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	width: 16px;
-	height: 16px;
-}
-.ui-icon,
-.ui-widget-content .ui-icon {
-	background-image: url("images/ui-icons_444444_256x240.png");
-}
-.ui-widget-header .ui-icon {
-	background-image: url("images/ui-icons_444444_256x240.png");
-}
-.ui-state-hover .ui-icon,
-.ui-state-focus .ui-icon,
-.ui-button:hover .ui-icon,
-.ui-button:focus .ui-icon {
-	background-image: url("images/ui-icons_555555_256x240.png");
-}
-.ui-state-active .ui-icon,
-.ui-button:active .ui-icon {
-	background-image: url("images/ui-icons_ffffff_256x240.png");
-}
-.ui-state-highlight .ui-icon,
-.ui-button .ui-state-highlight.ui-icon {
-	background-image: url("images/ui-icons_777620_256x240.png");
-}
-.ui-state-error .ui-icon,
-.ui-state-error-text .ui-icon {
-	background-image: url("images/ui-icons_cc0000_256x240.png");
-}
-.ui-button .ui-icon {
-	background-image: url("images/ui-icons_777777_256x240.png");
-}
-
-/* positioning */
-.ui-icon-blank { background-position: 16px 16px; }
-.ui-icon-caret-1-n { background-position: 0 0; }
-.ui-icon-caret-1-ne { background-position: -16px 0; }
-.ui-icon-caret-1-e { background-position: -32px 0; }
-.ui-icon-caret-1-se { background-position: -48px 0; }
-.ui-icon-caret-1-s { background-position: -65px 0; }
-.ui-icon-caret-1-sw { background-position: -80px 0; }
-.ui-icon-caret-1-w { background-position: -96px 0; }
-.ui-icon-caret-1-nw { background-position: -112px 0; }
-.ui-icon-caret-2-n-s { background-position: -128px 0; }
-.ui-icon-caret-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -65px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -65px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 1px -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-left,
-.ui-corner-tl {
-	border-top-left-radius: 3px;
-}
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-right,
-.ui-corner-tr {
-	border-top-right-radius: 3px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-left,
-.ui-corner-bl {
-	border-bottom-left-radius: 3px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-right,
-.ui-corner-br {
-	border-bottom-right-radius: 3px;
-}
-
-/* Overlays */
-.ui-widget-overlay {
-	background: #aaaaaa;
-	opacity: .003;
-	filter: Alpha(Opacity=.3); /* support: IE8 */
-}
-.ui-widget-shadow {
-	-webkit-box-shadow: 0px 0px 5px #666666;
-	box-shadow: 0px 0px 5px #666666;
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.theme.min.css b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.theme.min.css
deleted file mode 100644
index d2d4f6a11..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/jquery-ui.theme.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery UI - v1.12.1 - 2016-09-14
-* http://jqueryui.com
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-.ui-widget{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget.ui-widget-content{border:1px solid #c5c5c5}.ui-widget-content{border:1px solid #ddd;background:#fff;color:#333}.ui-widget-content a{color:#333}.ui-widget-header{border:1px solid #ddd;background:#e9e9e9;color:#333;font-weight:bold}.ui-widget-header a{color:#333}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default,.ui-button,html .ui-button.ui-state-disabled:hover,html .ui-button.ui-state-disabled:active{border:1px solid #c5c5c5;background:#f6f6f6;font-weight:normal;color:#454545}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited,a.ui-button,a:link.ui-button,a:visited.ui-button,.ui-button{color:#454545;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus,.ui-button:hover,.ui-button:focus{border:1px solid #ccc;background:#ededed;font-weight:normal;color:#2b2b2b}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited,a.ui-button:hover,a.ui-button:focus{color:#2b2b2b;text-decoration:none}.ui-visual-focus{box-shadow:0 0 3px 1px rgb(94,158,214)}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active,a.ui-button:active,.ui-button:active,.ui-button.ui-state-active:hover{border:1px solid #003eff;background:#007fff;font-weight:normal;color:#fff}.ui-icon-background,.ui-state-active .ui-icon-background{border:#003eff;background-color:#fff}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#fff;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #dad55e;background:#fffa90;color:#777620}.ui-state-checked{border:1px solid #dad55e;background:#fffa90}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#777620}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #f1a899;background:#fddfdf;color:#5f3f3f}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#5f3f3f}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#5f3f3f}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon,.ui-button:hover .ui-icon,.ui-button:focus .ui-icon{background-image:url("images/ui-icons_555555_256x240.png")}.ui-state-active .ui-icon,.ui-button:active .ui-icon{background-image:url("images/ui-icons_ffffff_256x240.png")}.ui-state-highlight .ui-icon,.ui-button .ui-state-highlight.ui-icon{background-image:url("images/ui-icons_777620_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cc0000_256x240.png")}.ui-button .ui-icon{background-image:url("images/ui-icons_777777_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-caret-1-n{background-position:0 0}.ui-icon-caret-1-ne{background-position:-16px 0}.ui-icon-caret-1-e{background-position:-32px 0}.ui-icon-caret-1-se{background-position:-48px 0}.ui-icon-caret-1-s{background-position:-65px 0}.ui-icon-caret-1-sw{background-position:-80px 0}.ui-icon-caret-1-w{background-position:-96px 0}.ui-icon-caret-1-nw{background-position:-112px 0}.ui-icon-caret-2-n-s{background-position:-128px 0}.ui-icon-caret-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-65px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-65px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:1px -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:3px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:3px}.ui-widget-overlay{background:#aaa;opacity:.003;filter:Alpha(Opacity=.3)}.ui-widget-shadow{-webkit-box-shadow:0 0 5px #666;box-shadow:0 0 5px #666}
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/package.json b/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/package.json
deleted file mode 100644
index e3c846e3a..000000000
--- a/client/client-editor/src/main/resources/webapp/js/jquery-ui-1.12.1/package.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-	"name": "jquery-ui",
-	"title": "jQuery UI",
-	"description": "A curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library.",
-	"version": "1.12.1",
-	"homepage": "http://jqueryui.com",
-	"author": {
-		"name": "jQuery Foundation and other contributors",
-		"url": "https://github.com/jquery/jquery-ui/blob/1.12.1/AUTHORS.txt"
-	},
-	"main": "ui/widget.js",
-	"maintainers": [
-		{
-			"name": "Scott González",
-			"email": "scott.gonzalez@gmail.com",
-			"url": "http://scottgonzalez.com"
-		},
-		{
-			"name": "Jörn Zaefferer",
-			"email": "joern.zaefferer@gmail.com",
-			"url": "http://bassistance.de"
-		},
-		{
-			"name": "Mike Sherov",
-			"email": "mike.sherov@gmail.com",
-			"url": "http://mike.sherov.com"
-		},
-		{
-			"name": "TJ VanToll",
-			"email": "tj.vantoll@gmail.com",
-			"url": "http://tjvantoll.com"
-		},
-		{
-			"name": "Felix Nagel",
-			"email": "info@felixnagel.com",
-			"url": "http://www.felixnagel.com"
-		},
-		{
-			"name": "Alex Schmitz",
-			"email": "arschmitz@gmail.com",
-			"url": "https://github.com/arschmitz"
-		}
-	],
-	"repository": {
-		"type": "git",
-		"url": "git://github.com/jquery/jquery-ui.git"
-	},
-	"bugs": "https://bugs.jqueryui.com/",
-	"license": "MIT",
-	"scripts": {
-		"test": "grunt"
-	},
-	"dependencies": {},
-	"devDependencies": {
-		"commitplease": "2.3.0",
-		"grunt": "0.4.5",
-		"grunt-bowercopy": "1.2.4",
-		"grunt-cli": "0.1.13",
-		"grunt-compare-size": "0.4.0",
-		"grunt-contrib-concat": "0.5.1",
-		"grunt-contrib-csslint": "0.5.0",
-		"grunt-contrib-jshint": "0.12.0",
-		"grunt-contrib-qunit": "1.0.1",
-		"grunt-contrib-requirejs": "0.4.4",
-		"grunt-contrib-uglify": "0.11.1",
-		"grunt-git-authors": "3.1.0",
-		"grunt-html": "6.0.0",
-		"grunt-jscs": "2.1.0",
-		"load-grunt-tasks": "3.4.0",
-		"rimraf": "2.5.1",
-		"testswarm": "1.1.0"
-	},
-	"keywords": []
-}
diff --git a/client/client-editor/src/main/resources/webapp/js/showhideElement.js b/client/client-editor/src/main/resources/webapp/js/showhideElement.js
deleted file mode 100644
index 7c1b9162b..000000000
--- a/client/client-editor/src/main/resources/webapp/js/showhideElement.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function showHideElement_display(showhide, element, _showstyle, _hidestyle, _buttonshowstyle, _buttonhidestyle) {
-    var checkbox = $(showhide).find('input:checkbox:first');
-    if (checkbox) {
-        checkbox.change(function(event) {
-            $(element).toggle("fast");
-        });
-    } else {
-        if (_buttonshowstyle) {
-            showhide.classList.remove(_buttonshowstyle);
-        }
-        if (_buttonhidestyle) {
-            showhide.classList.add(_buttonhidestyle);
-        }
-        showhide.onclick = function(event) {
-            $(element).toggle("fast");
-        };
-    }
-}
-
-function showHideElement(id_prefix, element, _initialhide, _showText, _hideText, _showstyle, _hidestyle,
-        _buttonshowstyle, _buttonhidestyle) {
-    var retdiv = document.createElement("div");
-    var divname = id_prefix;
-    retdiv.setAttribute("id", divname);
-    retdiv.setAttribute("class", "showHideElement");
-    var showhide = document.createElement("div");
-    retdiv.appendChild(showhide);
-    showhide.setAttribute("id", divname + "_showhide");
-    showhide.innerHTML = '<label class="ebSwitcher"><input type="checkbox" class="ebSwitcher-checkbox" /><div class="ebSwitcher-body"><div class="ebSwitcher-onLabel">Show</div><div class="ebSwitcher-switch"></div><div class="ebSwitcher-offLabel">Hide</div></div></label>';
-
-    retdiv.appendChild(element);
-    if (_initialhide != null && _initialhide === true) {
-        element.style.display = "none";
-    } else {
-        element.style.display = "block";
-    }
-    showHideElement_display(showhide, element, _showstyle, _hidestyle, undefined, undefined);
-    return retdiv;
-};
-
diff --git a/client/client-editor/src/main/resources/webapp/js/showhideTextarea.js b/client/client-editor/src/main/resources/webapp/js/showhideTextarea.js
deleted file mode 100644
index b5cd90a5a..000000000
--- a/client/client-editor/src/main/resources/webapp/js/showhideTextarea.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-function showHideTextarea_display_hide(showHideDivprefix) {
-    var ta = document.getElementById(showHideDivprefix + "_textarea");
-    var sh = document.getElementById(showHideDivprefix + "_showhide");
-    _showHideTextarea_display_hide(ta, sh)
-    if (sh["_clickable"] == true) {
-        sh.onclick = function(event) {
-            showHideTextarea_display_show(showHideDivprefix);
-        };
-    }
-}
-function showHideTextarea_display_show(showHideDivprefix) {
-    var ta = document.getElementById(showHideDivprefix + "_textarea");
-    var sh = document.getElementById(showHideDivprefix + "_showhide");
-    _showHideTextarea_display_show(ta, sh)
-    if (sh["_clickable"] == true) {
-        sh.onclick = function(event) {
-            showHideTextarea_display_hide(showHideDivprefix);
-        };
-    }
-}
-
-function _showHideTextarea_display_hide(txtarea, showhide) {
-    txtarea.classList.remove("showHideTextarea_displayed");
-    txtarea.classList.add("showHideTextarea_hidden");
-    showhide.classList.remove("showHideTextarea_show");
-    showhide.classList.add("showHideTextarea_hide");
-    showhide.innerHTML = showhide["showText"];
-}
-function _showHideTextarea_display_show(txtarea, showhide) {
-    txtarea.classList.add("showHideTextarea_displayed");
-    txtarea.classList.remove("showHideTextarea_hidden");
-    showhide.classList.add("showHideTextarea_show");
-    showhide.classList.remove("showHideTextarea_hide");
-    showhide.innerHTML = showhide["hideText"];
-}
-
-/*
- * Create a hideable textarea, inside a div, with some text displayed in a
- * clickable area to show the text area, and some other text displayed in the
- * clickable area to hide the text area
- * 
- * Each showHideTextarea must have a unique "id_prefix" vale as an identifier
- * "content" is the text to be put into the text area "initialshow" is a
- * boolean, if true the textarea will be shown initially, otherwise hidden
- * "editable" is a boolean, if true the textarea will be editable, otherwise
- * hidden "disabled" is a boolean, if true the textarea can be shown, otherwise
- * it canot be shown "showText" is the text that is shown to be clicked to show
- * the text area "hideText" is the text that is shown to be clicked to show the
- * text area
- * 
- * Returns a div representing the hideable textarea, with id 'id_prefix'. The
- * returned div will a textarea called "id_prefix+'_textarea'", that can be
- * queried to get the value of the textarea
- */
-
-function showHideTextarea(id_prefix, content, _initialshow, _editable, _disabled, _showText, _hideText) {
-    var initialshow = (_initialshow != null ? _initialshow : false);
-    var editable = (_editable != null ? _editable : true);
-    var callback;
-
-    var retdiv = document.createElement("div");
-    var divname = id_prefix;
-    retdiv.setAttribute("id", divname);
-    retdiv.setAttribute("class", "showHideTextarea");
-    var showhide = document.createElement("div");
-    retdiv.appendChild(showhide);
-    showhide.setAttribute("id", divname + "_showhide");
-    showhide.innerHTML = '<label class="ebSwitcher"><input type="checkbox" class="ebSwitcher-checkbox" /><div class="ebSwitcher-body"><div class="ebSwitcher-onLabel">Show</div><div class="ebSwitcher-switch"></div><div class="ebSwitcher-offLabel">Hide</div></div></label>';
-    var parent = document.createElement("div");
-    var textArea = document.createElement("textarea");
-    parent.appendChild(textArea);
-    retdiv.appendChild(parent);
-    textArea.setAttribute("id", divname + "_textarea");
-    textArea.setAttribute("name", divname + "_textarea");
-    textArea.style.width = "100%";
-    textArea.style.height = "400px";
-    textArea.style.display = "none";
-    if (content != null) {
-        textArea.value = content;
-    }
-
-    if (!editable) {
-        textArea.readOnly = (!editable);
-        textArea.style.cursor = "text";
-        textArea.style["border-color"] = "#E3E3E3";
-        textArea.style["background-color"] = "#F0F0F0";
-        textArea.style.color = "#B2B2B2";
-    }
-
-    var shown = false;
-    var checkbox = $(showhide).find('input:checkbox:first');
-    checkbox.change(function(event) {
-        if (!shown) {
-            createEditArea(textArea.getAttribute("id"), {
-                is_editable : editable
-            });
-            shown = true;
-        } else {
-            $(parent).toggle("fast");
-        }
-    });
-
-    return retdiv;
-};
-
diff --git a/client/client-editor/src/main/resources/webapp/resources/10px/ArrowDoubleLeftSmall_black_10px.svg b/client/client-editor/src/main/resources/webapp/resources/10px/ArrowDoubleLeftSmall_black_10px.svg
deleted file mode 100644
index 898b6df6c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/10px/ArrowDoubleLeftSmall_black_10px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0.001 10 10" enable-background="new 0 0.001 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path d="M3.293,8.708l-3-3C0.098,5.513,0,5.257,0,5.001S0.098,4.49,0.293,4.294l3-3c0.391-0.391,1.023-0.391,1.414,0
-	s0.391,1.023,0,1.414L2.414,5.001l2.293,2.293c0.391,0.391,0.391,1.023,0,1.414S3.684,9.099,3.293,8.708z"/>
-<path d="M8.293,8.708l-3-3C5.098,5.513,5,5.257,5,5.001S5.098,4.49,5.293,4.294l3-3c0.391-0.391,1.023-0.391,1.414,0
-	s0.391,1.023,0,1.414L7.414,5.001l2.293,2.293c0.391,0.391,0.391,1.023,0,1.414S8.684,9.099,8.293,8.708z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="10" height="10"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/10px/ArrowDoubleRightSmall_black_10px.svg b/client/client-editor/src/main/resources/webapp/resources/10px/ArrowDoubleRightSmall_black_10px.svg
deleted file mode 100644
index 999052812..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/10px/ArrowDoubleRightSmall_black_10px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0.001 10 10" enable-background="new 0 0.001 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path d="M6.707,1.294l3,3C9.902,4.49,10,4.745,10,5.001S9.902,5.513,9.707,5.708l-3,3c-0.391,0.391-1.023,0.391-1.414,0
-	s-0.391-1.023,0-1.414l2.293-2.293L5.293,2.708c-0.391-0.391-0.391-1.023,0-1.414S6.316,0.904,6.707,1.294z"/>
-<path d="M1.707,1.294l3,3C4.902,4.49,5,4.745,5,5.001S4.902,5.513,4.707,5.708l-3,3c-0.391,0.391-1.023,0.391-1.414,0
-	s-0.391-1.023,0-1.414l2.293-2.293L0.293,2.708c-0.391-0.391-0.391-1.023,0-1.414S1.316,0.904,1.707,1.294z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="10" height="10"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/10px/ArrowDownSmall_black_10px.svg b/client/client-editor/src/main/resources/webapp/resources/10px/ArrowDownSmall_black_10px.svg
deleted file mode 100644
index 896e04744..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/10px/ArrowDownSmall_black_10px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0.001 10 10" enable-background="new 0 0.001 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path d="M8.707,4.708l-3,2.999C5.512,7.902,5.256,8,5,8S4.488,7.902,4.293,7.707l-3-2.999c-0.391-0.391-0.391-1.023,0-1.414
-	s1.023-0.391,1.414,0L5,5.587l2.293-2.293c0.391-0.391,1.023-0.391,1.414,0S9.098,4.318,8.707,4.708z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="10" height="10"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/10px/ArrowLeftSmall_black_10px.svg b/client/client-editor/src/main/resources/webapp/resources/10px/ArrowLeftSmall_black_10px.svg
deleted file mode 100644
index 2b90d3680..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/10px/ArrowLeftSmall_black_10px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0.001 10 10" enable-background="new 0 0.001 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path d="M5.293,8.708l-3-3C2.098,5.513,2,5.257,2,5.001S2.098,4.49,2.293,4.294l3-3c0.391-0.391,1.023-0.391,1.414,0
-	s0.391,1.023,0,1.414L4.414,5.001l2.293,2.293c0.391,0.391,0.391,1.023,0,1.414S5.684,9.099,5.293,8.708z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="10" height="10"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/10px/ArrowRightSmall_black_10px.svg b/client/client-editor/src/main/resources/webapp/resources/10px/ArrowRightSmall_black_10px.svg
deleted file mode 100644
index 6b70349a7..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/10px/ArrowRightSmall_black_10px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0.001 10 10" enable-background="new 0 0.001 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path d="M4.707,1.295l3,3C7.902,4.491,8,4.747,8,5.002S7.902,5.514,7.707,5.709l-3,3C4.316,9.1,3.684,9.1,3.293,8.709
-	s-0.391-1.023,0-1.414l2.293-2.293L3.293,2.709c-0.391-0.391-0.391-1.023,0-1.414S4.316,0.905,4.707,1.295z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="10" height="10"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/10px/ArrowUpSmall_black_10px.svg b/client/client-editor/src/main/resources/webapp/resources/10px/ArrowUpSmall_black_10px.svg
deleted file mode 100644
index 6b4ae128f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/10px/ArrowUpSmall_black_10px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0.001 10 10" enable-background="new 0 0.001 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path d="M1.293,5.294l3-3C4.488,2.099,4.744,2.001,5,2.001s0.512,0.098,0.707,0.293l3,3c0.391,0.391,0.391,1.023,0,1.414
-	s-1.023,0.391-1.414,0L5,4.415L2.707,6.708c-0.391,0.391-1.023,0.391-1.414,0S0.902,5.685,1.293,5.294z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="10" height="10"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDoubleLeftSmall_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDoubleLeftSmall_black_16px.svg
deleted file mode 100644
index a75ec262a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDoubleLeftSmall_black_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1317.971 16 16" enable-background="new 13 1317.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M24.394,1329.677l-3-3c-0.195-0.195-0.293-0.451-0.293-0.707c0-0.256,0.098-0.512,0.293-0.707l3-3
-	c0.391-0.391,1.023-0.391,1.414,0s0.391,1.023,0,1.414l-2.293,2.293l2.293,2.293c0.391,0.391,0.391,1.023,0,1.414
-	C25.417,1330.068,24.785,1330.068,24.394,1329.677z"/>
-<path d="M19.393,1329.677l-3-3c-0.195-0.195-0.293-0.451-0.293-0.707c0-0.256,0.098-0.512,0.293-0.707l3-3
-	c0.391-0.391,1.023-0.391,1.414,0s0.391,1.023,0,1.414l-2.293,2.293l2.293,2.293c0.391,0.391,0.391,1.023,0,1.414
-	C20.417,1330.068,19.784,1330.068,19.393,1329.677z"/>
-<rect x="13" y="1317.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDoubleRightSmall_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDoubleRightSmall_black_16px.svg
deleted file mode 100644
index 7559f7968..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDoubleRightSmall_black_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1285.971 16 16" enable-background="new 13 1285.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M17.706,1290.263l3,3c0.195,0.195,0.293,0.451,0.293,0.707c0,0.256-0.098,0.512-0.293,0.707l-3,3
-	c-0.391,0.391-1.023,0.391-1.414,0c-0.391-0.391-0.391-1.023,0-1.414l2.293-2.293l-2.293-2.293c-0.391-0.391-0.391-1.023,0-1.414
-	S17.315,1289.873,17.706,1290.263z"/>
-<path d="M22.707,1290.263l3,3c0.195,0.195,0.293,0.451,0.293,0.707c0,0.256-0.098,0.512-0.293,0.707l-3,3
-	c-0.391,0.391-1.023,0.391-1.414,0c-0.391-0.391-0.391-1.023,0-1.414l2.293-2.293l-2.293-2.293c-0.391-0.391-0.391-1.023,0-1.414
-	S22.316,1289.873,22.707,1290.263z"/>
-<rect x="13" y="1285.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDownSmall_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDownSmall_black_16px.svg
deleted file mode 100644
index 51c9dbbfd..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDownSmall_black_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1221.971 16 16" enable-background="new 13 1221.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M24.707,1229.578l-3,3c-0.195,0.195-0.451,0.293-0.707,0.293s-0.512-0.098-0.707-0.293l-3-3
-	c-0.391-0.391-0.391-1.023,0-1.414s1.023-0.391,1.414,0l2.293,2.293l2.293-2.293c0.391-0.391,1.023-0.391,1.414,0
-	S25.098,1229.188,24.707,1229.578z"/>
-<rect x="13" y="1221.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDownSmall_blue_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDownSmall_blue_16px.svg
deleted file mode 100644
index 2355a5ad6..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDownSmall_blue_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1.5 -4 16 16" enable-background="new -1.5 -4 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#00A9D4" d="M12.332,2.732l-4.801,4.8C7.219,7.844,6.81,8.001,6.4,8.001S5.582,7.844,5.27,7.532l-4.801-4.8
-	c-0.625-0.626-0.625-1.637,0-2.263c0.625-0.626,1.638-0.626,2.263,0L6.4,4.139l3.669-3.669c0.625-0.626,1.638-0.626,2.263,0
-	C12.957,1.096,12.957,2.106,12.332,2.732"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDownSmall_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDownSmall_white_16px.svg
deleted file mode 100644
index 3a31698fd..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDownSmall_white_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-4 -5.5 16 16" enable-background="new -4 -5.5 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M0.293,0.293C0.488,0.1,0.744,0,1,0s0.512,0.1,0.707,0.293l2.294,2.293l2.293-2.293
-	c0.391-0.391,1.023-0.391,1.414,0c0.391,0.393,0.391,1.023,0,1.414l-3,3c-0.391,0.392-1.024,0.392-1.415,0l-3-3
-	C-0.098,1.316-0.098,0.686,0.293,0.293"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDown_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDown_black_16px.svg
deleted file mode 100644
index 922491d8a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDown_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 613.971 16 16" enable-background="new 13 613.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M21,626.969c-0.25,0-0.491-0.073-0.668-0.26l-4.055-4.324c-0.368-0.391-0.369-1.024,0-1.414
-	c0.369-0.391,0.967-0.391,1.336,0l2.442,2.616v-6.616c0-0.553,0.423-1,0.945-1c0.521,0,0.945,0.447,0.945,1v6.617l2.442-2.617
-	c0.369-0.391,0.967-0.391,1.336,0c0.185,0.195,0.277,0.451,0.277,0.707c0,0.256-0.092,0.512-0.277,0.707l-4.056,4.324
-	C21.49,626.896,21.25,626.969,21,626.969z"/>
-<rect x="13" y="613.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDown_blue_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDown_blue_16px.svg
deleted file mode 100644
index 2355a5ad6..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDown_blue_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1.5 -4 16 16" enable-background="new -1.5 -4 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#00A9D4" d="M12.332,2.732l-4.801,4.8C7.219,7.844,6.81,8.001,6.4,8.001S5.582,7.844,5.27,7.532l-4.801-4.8
-	c-0.625-0.626-0.625-1.637,0-2.263c0.625-0.626,1.638-0.626,2.263,0L6.4,4.139l3.669-3.669c0.625-0.626,1.638-0.626,2.263,0
-	C12.957,1.096,12.957,2.106,12.332,2.732"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDown_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDown_white_16px.svg
deleted file mode 100644
index a0ff13656..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowDown_white_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-2.5 -2.5 16 16" enable-background="new -2.5 -2.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M5.292,11.029c-0.265,0-0.52-0.104-0.707-0.293L0.292,6.413c-0.39-0.391-0.39-1.024,0.001-1.414
-	c0.391-0.391,1.023-0.391,1.414,0l2.586,2.616V1c0-0.553,0.447-1,1-1c0.552,0,1,0.447,1,1v6.616l2.585-2.617
-	c0.391-0.392,1.023-0.392,1.414,0c0.195,0.194,0.293,0.451,0.293,0.707s-0.098,0.512-0.293,0.707l-4.293,4.323
-	C5.813,10.924,5.559,11.029,5.292,11.029"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowLeftSmall_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowLeftSmall_black_16px.svg
deleted file mode 100644
index 6cdafed5c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowLeftSmall_black_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1253.971 16 16" enable-background="new 13 1253.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M21.293,1265.677l-3-3c-0.195-0.195-0.293-0.451-0.293-0.707c0-0.256,0.098-0.512,0.293-0.707l3-3
-	c0.391-0.391,1.023-0.391,1.414,0s0.391,1.023,0,1.414l-2.293,2.293l2.293,2.293c0.391,0.391,0.391,1.023,0,1.414
-	C22.316,1266.068,21.684,1266.068,21.293,1265.677z"/>
-<rect x="13" y="1253.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowLeftSmall_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowLeftSmall_white_16px.svg
deleted file mode 100644
index 4c0270f58..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowLeftSmall_white_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-5.5 -4 16 16" enable-background="new -5.5 -4 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M4.708,0.293C4.901,0.488,5.001,0.744,5.001,1s-0.1,0.512-0.293,0.707L2.415,4.001l2.293,2.293
-	c0.391,0.391,0.391,1.023,0,1.414c-0.393,0.391-1.023,0.391-1.414,0l-3-3c-0.392-0.391-0.392-1.024,0-1.415l3-3
-	C3.685-0.098,4.315-0.098,4.708,0.293"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowLeft_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowLeft_black_16px.svg
deleted file mode 100644
index d1a5bd8e0..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowLeft_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 645.971 16 16" enable-background="new 13 645.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M16.001,653.97c0-0.251,0.073-0.491,0.261-0.668l4.324-4.055c0.391-0.368,1.023-0.369,1.414,0
-	c0.391,0.369,0.391,0.967,0,1.336l-2.616,2.443H26c0.553,0,1,0.423,1,0.945c0,0.521-0.447,0.945-1,0.945h-6.617L22,657.357
-	c0.391,0.369,0.391,0.967,0,1.336c-0.195,0.185-0.451,0.277-0.707,0.277s-0.512-0.092-0.707-0.277l-4.324-4.056
-	C16.074,654.46,16.001,654.22,16.001,653.97z"/>
-<rect x="13" y="645.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowLeft_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowLeft_white_16px.svg
deleted file mode 100644
index 29c191931..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowLeft_white_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M2,8.001c0-0.25,0.073-0.491,0.261-0.669l4.324-4.056c0.391-0.367,1.023-0.369,1.414,0s0.391,0.968,0,1.336
-	L5.383,7.055l6.616,0c0.554,0,1,0.425,1,0.945c0,0.522-0.446,0.946-1,0.946H5.382l2.617,2.442c0.391,0.369,0.391,0.967,0,1.336
-	c-0.195,0.186-0.451,0.277-0.707,0.277s-0.512-0.092-0.707-0.277L2.261,8.67C2.073,8.493,2,8.252,2,8.001z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-</svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowRightSmall_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowRightSmall_black_16px.svg
deleted file mode 100644
index f8c8dc994..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowRightSmall_black_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1189.971 16 16" enable-background="new 13 1189.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M20.706,1194.263l3,3c0.195,0.195,0.293,0.451,0.293,0.707c0,0.256-0.098,0.512-0.293,0.707l-3,3
-	c-0.391,0.391-1.023,0.391-1.414,0c-0.391-0.391-0.391-1.023,0-1.414l2.293-2.293l-2.293-2.293c-0.391-0.391-0.391-1.023,0-1.414
-	S20.315,1193.873,20.706,1194.263z"/>
-<rect x="13" y="1189.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowRightSmall_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowRightSmall_white_16px.svg
deleted file mode 100644
index ea4aa1822..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowRightSmall_white_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-5.5 -4 16 16" enable-background="new -5.5 -4 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M0.293,7.708C0.1,7.512,0,7.256,0,7s0.1-0.512,0.293-0.707L2.586,4L0.293,1.707
-	c-0.391-0.391-0.391-1.023,0-1.414c0.393-0.391,1.023-0.391,1.414,0l3,3c0.392,0.391,0.392,1.023,0,1.414l-3,3
-	C1.316,8.098,0.686,8.098,0.293,7.708"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowRight_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowRight_black_16px.svg
deleted file mode 100644
index c14a488aa..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowRight_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 581.971 16 16" enable-background="new 13 581.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M25.999,589.972c0,0.25-0.073,0.491-0.261,0.669l-4.324,4.055c-0.391,0.368-1.023,0.369-1.414,0
-	c-0.391-0.369-0.391-0.967,0-1.336l2.616-2.443H16c-0.553,0-1-0.423-1-0.945c0-0.521,0.447-0.945,1-0.945h6.617L20,586.584
-	c-0.391-0.369-0.391-0.967,0-1.336c0.195-0.185,0.451-0.277,0.707-0.277s0.512,0.092,0.707,0.277l4.324,4.056
-	C25.926,589.481,25.999,589.721,25.999,589.972z"/>
-<rect x="13" y="581.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowRight_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowRight_white_16px.svg
deleted file mode 100644
index 0e510ee8c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowRight_white_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M12.999,8.002c0,0.25-0.073,0.491-0.261,0.669l-4.324,4.056c-0.391,0.367-1.023,0.369-1.414,0
-	s-0.391-0.968,0-1.336l2.616-2.443H3c-0.553,0-1-0.424-1-0.945C2,7.48,2.447,7.056,3,7.056h6.617L7,4.614
-	C6.609,4.245,6.609,3.647,7,3.278c0.195-0.185,0.451-0.277,0.707-0.277s0.512,0.092,0.707,0.277l4.324,4.056
-	C12.926,7.511,12.999,7.751,12.999,8.002z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowUpSmall_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowUpSmall_black_16px.svg
deleted file mode 100644
index c51e6ab9e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowUpSmall_black_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1157.971 16 16" enable-background="new 13 1157.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M17.293,1167.264l3-3c0.195-0.195,0.451-0.293,0.707-0.293s0.512,0.098,0.707,0.293l3,3c0.391,0.391,0.391,1.023,0,1.414
-	c-0.391,0.391-1.023,0.391-1.414,0L21,1166.385l-2.293,2.293c-0.391,0.391-1.023,0.391-1.414,0
-	C16.902,1168.288,16.902,1167.655,17.293,1167.264z"/>
-<rect x="13" y="1157.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowUp_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowUp_black_16px.svg
deleted file mode 100644
index 4f096ee5f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowUp_black_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 549.971 16 16" enable-background="new 13 549.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M21,552.971c0.25,0,0.491,0.073,0.668,0.26l4.055,4.324c0.368,0.391,0.369,1.024,0,1.414c-0.369,0.391-0.967,0.391-1.336,0
-	l-2.442-2.616v6.616c0,0.553-0.423,1-0.945,1c-0.521,0-0.945-0.447-0.945-1v-6.617l-2.442,2.617c-0.369,0.391-0.967,0.391-1.336,0
-	c-0.185-0.195-0.277-0.451-0.277-0.707s0.092-0.512,0.277-0.707l4.056-4.324C20.51,553.044,20.75,552.971,21,552.971z"/>
-<rect x="13" y="549.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowUp_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ArrowUp_white_16px.svg
deleted file mode 100644
index 9ccbe20a1..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ArrowUp_white_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-2.5 -2.5 16 16" enable-background="new -2.5 -2.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M5.294,0c0.265,0,0.52,0.104,0.707,0.293l4.293,4.323c0.39,0.391,0.39,1.024-0.001,1.414
-	c-0.391,0.391-1.023,0.391-1.414,0L6.293,3.414v6.615c0,0.553-0.447,1-1,1c-0.552,0-1-0.447-1-1V3.413L1.707,6.03
-	c-0.391,0.392-1.023,0.392-1.414,0C0.098,5.836,0,5.579,0,5.323s0.098-0.512,0.293-0.707l4.294-4.323C4.773,0.104,5.027,0,5.294,0"
-	/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/BSCFunction_Yellow_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/BSCFunction_Yellow_16px.svg
deleted file mode 100644
index ebb4059da..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/BSCFunction_Yellow_16px.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<rect x="8" y="709.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<path d="M14.681,12.305c0.022-0.091,0.105-0.152,0.197-0.152H16v-1.366h-1.122c-0.092,0-0.175-0.062-0.197-0.152
-	c-0.077-0.29-0.19-0.569-0.342-0.825c-0.046-0.078-0.033-0.179,0.03-0.245l0.794-0.795l-0.965-0.963l-0.793,0.792
-	c-0.066,0.066-0.167,0.077-0.246,0.031c-0.257-0.15-0.536-0.264-0.824-0.341c-0.09-0.022-0.153-0.105-0.153-0.196V6.969h-1.365
-	v1.123c0,0.091-0.062,0.176-0.152,0.196c-0.29,0.076-0.566,0.19-0.825,0.341C9.76,8.675,9.658,8.663,9.593,8.598L8.8,7.806
-	L7.836,8.769l0.793,0.795C8.695,9.63,8.709,9.73,8.661,9.809c-0.151,0.257-0.264,0.536-0.343,0.825
-	c-0.024,0.09-0.104,0.152-0.199,0.152H7v1.366h1.121c0.094,0,0.173,0.062,0.198,0.152c0.078,0.289,0.191,0.566,0.342,0.825
-	c0.048,0.077,0.034,0.178-0.03,0.246l-0.794,0.792l0.965,0.965l0.793-0.793c0.065-0.066,0.165-0.077,0.244-0.031
-	c0.261,0.15,0.537,0.264,0.826,0.341c0.091,0.022,0.153,0.105,0.153,0.197v1.122h1.365v-1.122c0-0.092,0.062-0.175,0.152-0.197
-	c0.289-0.077,0.567-0.19,0.825-0.341c0.077-0.046,0.179-0.034,0.246,0.031l0.793,0.793l0.964-0.965l-0.793-0.792
-	c-0.064-0.067-0.076-0.168-0.03-0.246C14.49,12.871,14.604,12.594,14.681,12.305z M11.499,13.438c-1.086,0-1.967-0.881-1.967-1.968
-	c0-1.088,0.882-1.97,1.967-1.97c1.089,0,1.971,0.882,1.971,1.97C13.47,12.557,12.588,13.438,11.499,13.438z"/>
-<path fill="#FABB00" d="M6,11.469c0-3.038,2.462-5.5,5.5-5.5c0.197,0,0.393,0.012,0.584,0.032L9.547,0.926
-	C9.254,0.34,8.654-0.03,8-0.03S6.746,0.34,6.453,0.926L0.182,13.468c-0.269,0.535-0.238,1.173,0.075,1.682
-	c0.315,0.511,0.872,0.82,1.472,0.82h6.617C6.928,14.975,6,13.331,6,11.469z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/BSCFunction_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/BSCFunction_black_16px.svg
deleted file mode 100644
index 1d4bcc7f0..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/BSCFunction_black_16px.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<rect x="8" y="645.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<path d="M14.681,12.305c0.022-0.091,0.105-0.152,0.197-0.152H16v-1.366h-1.122c-0.092,0-0.175-0.062-0.197-0.152
-	c-0.077-0.29-0.19-0.569-0.342-0.825c-0.046-0.078-0.033-0.179,0.03-0.245l0.794-0.795l-0.965-0.963l-0.793,0.792
-	c-0.066,0.066-0.167,0.077-0.246,0.031c-0.257-0.15-0.536-0.264-0.824-0.341c-0.09-0.022-0.153-0.105-0.153-0.196V6.969h-1.365
-	v1.123c0,0.091-0.062,0.176-0.152,0.196c-0.29,0.076-0.566,0.19-0.825,0.341C9.76,8.675,9.658,8.663,9.593,8.598L8.8,7.806
-	L7.836,8.769l0.793,0.795C8.695,9.63,8.709,9.73,8.661,9.809c-0.151,0.257-0.264,0.536-0.343,0.825
-	c-0.024,0.09-0.104,0.152-0.199,0.152H7v1.366h1.121c0.094,0,0.173,0.062,0.199,0.152c0.078,0.289,0.191,0.566,0.342,0.825
-	c0.048,0.077,0.034,0.178-0.03,0.246l-0.794,0.792l0.965,0.965l0.793-0.793c0.065-0.066,0.165-0.077,0.244-0.031
-	c0.261,0.15,0.537,0.264,0.826,0.341c0.091,0.022,0.153,0.105,0.153,0.197v1.122h1.365v-1.122c0-0.092,0.062-0.175,0.152-0.197
-	c0.289-0.077,0.567-0.19,0.825-0.341c0.077-0.046,0.179-0.034,0.246,0.031l0.793,0.793l0.964-0.965l-0.793-0.792
-	c-0.064-0.067-0.076-0.168-0.03-0.246C14.49,12.871,14.604,12.594,14.681,12.305z M11.499,13.438c-1.086,0-1.967-0.881-1.967-1.968
-	c0-1.088,0.882-1.97,1.967-1.97c1.089,0,1.971,0.882,1.971,1.97C13.47,12.557,12.588,13.438,11.499,13.438z"/>
-<path d="M6,11.469c0-3.038,2.462-5.5,5.5-5.5c0.197,0,0.393,0.012,0.584,0.032L9.547,0.926C9.254,0.34,8.654-0.03,8-0.03
-	S6.746,0.34,6.453,0.926L0.182,13.468c-0.269,0.535-0.239,1.173,0.075,1.682c0.315,0.511,0.872,0.82,1.472,0.82h6.617
-	C6.928,14.975,6,13.331,6,11.469z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/BSC_Yellow_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/BSC_Yellow_16px.svg
deleted file mode 100644
index 0e387b4ca..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/BSC_Yellow_16px.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 677.97 16 16" enable-background="new 8 677.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<g>
-	<g>
-		<path fill="#FABB00" d="M23.742,693.149c-0.316,0.511-0.873,0.821-1.472,0.821H9.729c-0.599,0-1.155-0.31-1.471-0.821
-			c-0.314-0.508-0.344-1.146-0.075-1.681l6.27-12.542c0.293-0.586,0.893-0.956,1.547-0.956s1.254,0.37,1.547,0.956l6.271,12.542
-			C24.086,692.003,24.056,692.641,23.742,693.149z"/>
-	</g>
-</g>
-<rect x="8" y="677.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/BSC_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/BSC_black_16px.svg
deleted file mode 100644
index 3c21be133..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/BSC_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 613.97 16 16" enable-background="new 8 613.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<g>
-	<path d="M23.742,629.149c-0.316,0.511-0.873,0.821-1.472,0.821H9.729c-0.599,0-1.155-0.31-1.471-0.821
-		c-0.314-0.508-0.344-1.146-0.075-1.681l6.27-12.542c0.293-0.586,0.893-0.956,1.547-0.956s1.254,0.37,1.547,0.956l6.271,12.542
-		C24.086,628.003,24.056,628.641,23.742,629.149z"/>
-</g>
-<rect x="8" y="613.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/Cancelled_Black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/Cancelled_Black_16px.svg
deleted file mode 100644
index e7cf56b9f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/Cancelled_Black_16px.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path fill="#1D1D1B" d="M8,0C3.582,0,0,3.582,0,8s3.582,8,8,8s8-3.582,8-8S12.418,0,8,0z M11,9H5C4.448,9,4,8.552,4,8s0.448-1,1-1h6
-	c0.553,0,1,0.448,1,1S11.553,9,11,9z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/CommandLineInterface_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/CommandLineInterface_black_16px.svg
deleted file mode 100644
index 78de1084f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/CommandLineInterface_black_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="13" y="1669.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<g>
-	<path d="M16,13c0,1.65-1.35,3-3,3H3c-1.65,0-3-1.35-3-3V3c0-1.649,1.35-3,3-3h10c1.65,0,3,1.351,3,3V13z"/>
-</g>
-<path fill="#FFFFFF" d="M7.707,10.707l-3,3C4.512,13.902,4.256,14,4,14s-0.512-0.098-0.707-0.293c-0.391-0.391-0.391-1.023,0-1.414
-	L5.586,10L3.293,7.707c-0.391-0.39-0.391-1.023,0-1.414s1.023-0.391,1.414,0l3,3C7.895,9.48,8,9.734,8,10S7.895,10.52,7.707,10.707z
-	"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/CommandLineInterface_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/CommandLineInterface_white_16px.svg
deleted file mode 100644
index c3419dd66..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/CommandLineInterface_white_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M13,0H3C1.35,0,0,1.351,0,3v10c0,1.65,1.35,3,3,3h10c1.65,0,3-1.35,3-3V3C16,1.351,14.65,0,13,0z
-	 M7.707,10.707l-3,3C4.512,13.902,4.256,14,4,14s-0.512-0.098-0.707-0.293c-0.391-0.391-0.391-1.023,0-1.414L5.586,10L3.293,7.707
-	c-0.391-0.39-0.391-1.023,0-1.414s1.023-0.391,1.414,0l3,3C7.895,9.48,8,9.734,8,10S7.895,10.52,7.707,10.707z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/Comment_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/Comment_black_16px.svg
deleted file mode 100644
index 8f334bdc6..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/Comment_black_16px.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path d="M13,0H3C1.35,0,0,1.35,0,3v6c0,1.65,1.35,3,3,3v3c0,0.55,0.382,0.762,0.848,0.471L9.398,12H13c1.65,0,3-1.35,3-3V3
-	C16,1.35,14.65,0,13,0z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/Link_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/Link_black_16px.svg
deleted file mode 100644
index a5471dc20..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/Link_black_16px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#1d1d1b;}</style></defs><title>link_icon</title><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M6.7,13.62l2.36-2.35a3.21,3.21,0,0,1-2.24-.47L5.28,12.32h0a1.27,1.27,0,0,1-1.65-.12,1.23,1.23,0,0,1,0-1.53h0L6.7,7.62a1.25,1.25,0,0,1,1.54,0A1,1,0,0,0,9.3,7.38a1,1,0,0,0,.24-1.06,2.82,2.82,0,0,0-4.25.12l-3,2.82a3.12,3.12,0,0,0,.12,4.35,3,3,0,0,0,4.25,0Z"/><path class="cls-1" d="M9.3,2.33,6.94,4.68a3.21,3.21,0,0,1,2.24.47l1.54-1.53h0a1.27,1.27,0,0,1,1.65.12,1.41,1.41,0,0,1,0,1.65h0L9.3,8.32a1.25,1.25,0,0,1-1.54,0,1,1,0,0,0-1.06.24,1.12,1.12,0,0,0-.35,1.18c2,2,4.37,0,4.37,0l3-2.94h0a3.12,3.12,0,0,0-.12-4.35A3,3,0,0,0,9.3,2.33Z"/></g></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/RBS_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/RBS_black_16px.svg
deleted file mode 100644
index ae6381973..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/RBS_black_16px.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 5.97 16 16" enable-background="new 8 5.97 16 16" xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="M21.5,6.47
-	c0.763,0.883,1.2,1.5,1.2,3c0,1.5-0.437,2.117-1.199,3"/>
-<path fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="M19.5,7.97
-	c0.314,0.418,0.5,0.937,0.5,1.5s-0.186,1.082-0.5,1.5"/>
-<path fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="M10.5,6.47
-	c-0.763,0.883-1.2,1.5-1.2,3c0,1.5,0.437,2.117,1.2,3"/>
-<path fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="M12.5,7.97
-	C12.186,8.388,12,8.907,12,9.47s0.186,1.082,0.5,1.5"/>
-<path d="M20.541,20.928c-0.003-0.039-0.008-0.077-0.019-0.115c-0.004-0.015-0.002-0.031-0.008-0.046l-3.732-9.739
-	c0.572-0.288,0.969-0.874,0.969-1.558c0-0.967-0.784-1.75-1.75-1.75c-0.969,0-1.75,0.783-1.75,1.75c0,0.675,0.384,1.252,0.943,1.545
-	l-3.738,9.752c-0.112,0.292,0.034,0.62,0.326,0.732c0.033,0.013,0.066,0.011,0.1,0.017c0.021,0.005,0.04,0.007,0.06,0.01
-	c0.037,0.003,0.071,0.004,0.107,0c0.098-0.006,0.196-0.027,0.283-0.086C13.734,20.501,14,19.97,16,19.97s2.266,0.531,3.669,1.471
-	c0.087,0.058,0.184,0.08,0.281,0.086c0.012,0.001,0.022,0.01,0.034,0.01c0.019,0,0.039-0.009,0.058-0.011
-	c0.032-0.003,0.063-0.009,0.095-0.018c0.017-0.005,0.033-0.003,0.05-0.009c0.019-0.007,0.031-0.022,0.049-0.031
-	c0.035-0.018,0.067-0.037,0.098-0.062c0.03-0.024,0.056-0.05,0.08-0.08c0.013-0.015,0.03-0.024,0.042-0.041
-	c0.009-0.014,0.01-0.03,0.018-0.044c0.019-0.034,0.032-0.069,0.044-0.107c0.011-0.034,0.02-0.067,0.023-0.103
-	C20.545,20.998,20.543,20.964,20.541,20.928z M15.984,12.117l1.477,3.853h-2.954L15.984,12.117z M16,18.97
-	c-0.95,0.001-1.902,0.246-2.927,0.744l1.052-2.744h3.72l1.046,2.728C17.879,19.212,16.938,18.971,16,18.97z"/>
-<rect x="8" y="5.97" fill="none" width="16" height="16"/>
-<rect x="8" y="5.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/RBS_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/RBS_white_16px.svg
deleted file mode 100644
index 41c155707..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/RBS_white_16px.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M9.75,3.688c0-0.967-0.783-1.75-1.75-1.75c-0.969,0-1.75,0.783-1.75,1.75S7.031,5.438,8,5.438
-	C8.967,5.438,9.75,4.655,9.75,3.688"/>
-<path fill="#FFFFFF" d="M12,15.941c-0.229,0-0.443-0.138-0.529-0.364L8,6.522l-3.471,9.055c-0.112,0.292-0.442,0.439-0.732,0.326
-	c-0.292-0.111-0.439-0.44-0.326-0.731l4-10.437c0.168-0.439,0.891-0.439,1.059,0l4,10.437c0.112,0.291-0.034,0.62-0.326,0.731
-	C12.136,15.93,12.066,15.941,12,15.941"/>
-<path fill="#FFFFFF" d="M10.112,11.816H5.938c-0.313,0-0.567-0.254-0.567-0.567c0-0.313,0.254-0.566,0.567-0.566h4.175
-	c0.313,0,0.567,0.254,0.567,0.566C10.68,11.563,10.426,11.816,10.112,11.816"/>
-<path fill="#FFFFFF" d="M12.031,15.941c-0.08,0-0.16-0.017-0.236-0.052c-0.663-0.305-1.204-0.567-1.657-0.787
-	c-2.083-1.011-2.083-1.011-4.271,0.035c-0.443,0.213-0.968,0.463-1.601,0.753c-0.286,0.129-0.621,0.005-0.751-0.28
-	c-0.131-0.285-0.005-0.621,0.28-0.752c0.626-0.286,1.144-0.534,1.582-0.744c2.58-1.233,2.775-1.236,5.255-0.032
-	c0.447,0.218,0.98,0.477,1.635,0.777c0.285,0.131,0.409,0.467,0.279,0.752C12.451,15.818,12.246,15.941,12.031,15.941"/>
-<path fill="#FFFFFF" d="M3.971,6.142c-0.158,0-0.311-0.09-0.384-0.242C3.322,5.346,3.188,4.751,3.188,4.137
-	c0-0.948,0.331-1.871,0.933-2.602C4.271,1.355,4.54,1.33,4.72,1.478c0.182,0.149,0.207,0.418,0.058,0.599
-	c-0.477,0.578-0.74,1.309-0.74,2.061c0,0.487,0.107,0.957,0.317,1.396c0.102,0.212,0.013,0.465-0.2,0.566
-	C4.095,6.128,4.032,6.142,3.971,6.142"/>
-<path fill="#FFFFFF" d="M1.042,7.6c-0.158,0-0.312-0.089-0.384-0.242C0.222,6.443,0,5.464,0,4.448c0-1.564,0.547-3.09,1.54-4.294
-	c0.149-0.181,0.419-0.205,0.599-0.057C2.32,0.247,2.346,0.514,2.196,0.695C1.328,1.747,0.85,3.081,0.85,4.448
-	c0,0.889,0.194,1.744,0.576,2.544c0.102,0.212,0.012,0.466-0.2,0.566C1.166,7.587,1.104,7.6,1.042,7.6"/>
-<path fill="#FFFFFF" d="M12.029,6.142c0.158,0,0.311-0.09,0.384-0.242c0.265-0.554,0.398-1.148,0.398-1.763
-	c0-0.948-0.331-1.871-0.933-2.602c-0.15-0.181-0.419-0.206-0.599-0.058c-0.182,0.149-0.207,0.418-0.058,0.599
-	c0.477,0.578,0.739,1.309,0.739,2.061c0,0.487-0.106,0.957-0.316,1.396c-0.102,0.212-0.013,0.465,0.2,0.566
-	C11.905,6.128,11.967,6.142,12.029,6.142"/>
-<path fill="#FFFFFF" d="M14.958,7.6c0.158,0,0.311-0.089,0.384-0.242C15.778,6.443,16,5.464,16,4.448c0-1.564-0.547-3.09-1.54-4.294
-	c-0.15-0.181-0.419-0.205-0.599-0.057c-0.182,0.149-0.207,0.417-0.058,0.598c0.868,1.052,1.347,2.386,1.347,3.753
-	c0,0.889-0.194,1.744-0.576,2.544c-0.102,0.212-0.013,0.466,0.199,0.566C14.834,7.587,14.896,7.6,14.958,7.6"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/SyncError_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/SyncError_16px.svg
deleted file mode 100644
index 47416af9a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/SyncError_16px.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0.5 0.5 16 16" enable-background="new 0.5 0.5 16 16" xml:space="preserve">
-<g>
-	<path d="M15.244,4.762l0.205,0.185L12.986,2.73c-0.25-0.224-0.625-0.292-0.948-0.17C11.713,2.682,11.5,2.967,11.5,3.284v1.172V4.5
-		h-7v2h7v0.044v1.172c0.001,0.212,0.096,0.411,0.255,0.556c0.078,0.069,0.175,0.127,0.283,0.168c0.323,0.121,0.701,0.054,0.948-0.17
-		l2.26-2.033C15.586,5.934,15.585,5.068,15.244,4.762z"/>
-	<polygon fill="#515151" points="1.756,11.239 1.756,11.239 1.551,11.055 	"/>
-	<path d="M5.5,9.5V9.456V8.283c0-0.213-0.095-0.411-0.254-0.555C5.167,7.658,5.071,7.6,4.962,7.559
-		c-0.324-0.121-0.701-0.053-0.949,0.17L1.754,9.762c-0.34,0.305-0.339,1.17,0.002,1.479l2.257,2.028
-		c0.25,0.228,0.625,0.293,0.949,0.17C5.289,13.318,5.5,13.033,5.5,12.717v-1.173V11.5h7v-2H5.5z"/>
-</g>
-<g>
-	<path fill="#E32219" d="M12.5,8.499c-2.209,0-4,1.791-4,4s1.791,4,4,4s4-1.791,4-4S14.709,8.499,12.5,8.499"/>
-	<path fill="#FFFFFF" d="M14.268,13.559c0.196,0.196,0.196,0.512,0,0.707c-0.097,0.1-0.225,0.146-0.354,0.146
-		c-0.127,0-0.256-0.049-0.354-0.146L12.5,13.205l-1.061,1.061c-0.1,0.1-0.228,0.146-0.354,0.146s-0.256-0.049-0.354-0.146
-		c-0.193-0.195-0.193-0.511,0-0.707l1.063-1.061l-1.063-1.061c-0.193-0.195-0.193-0.514,0-0.707c0.195-0.195,0.514-0.195,0.707,0
-		l1.063,1.061l1.063-1.061c0.194-0.195,0.512-0.195,0.707,0c0.194,0.193,0.194,0.512,0,0.707l-1.063,1.061L14.268,13.559z"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/Syncd_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/Syncd_16px.svg
deleted file mode 100644
index 534bd7ebc..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/Syncd_16px.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0.5 0.5 16 16" enable-background="new 0.5 0.5 16 16" xml:space="preserve">
-<g>
-	<path d="M15.244,4.762l0.205,0.185L12.986,2.73c-0.25-0.224-0.625-0.292-0.948-0.17C11.713,2.682,11.5,2.967,11.5,3.284v1.172V4.5
-		h-7v2h7v0.044v1.172c0.001,0.212,0.096,0.411,0.255,0.556c0.078,0.069,0.175,0.127,0.283,0.168c0.323,0.121,0.701,0.054,0.948-0.17
-		l2.26-2.033C15.586,5.934,15.585,5.068,15.244,4.762z"/>
-	<polygon fill="#515151" points="1.756,11.239 1.756,11.239 1.551,11.055 	"/>
-	<path d="M5.5,9.5V9.456V8.283c0-0.213-0.095-0.411-0.254-0.555C5.167,7.658,5.071,7.6,4.962,7.559
-		c-0.324-0.121-0.701-0.053-0.949,0.17L1.754,9.762c-0.34,0.305-0.339,1.17,0.002,1.479l2.257,2.028
-		c0.25,0.228,0.625,0.293,0.949,0.17C5.289,13.318,5.5,13.033,5.5,12.717v-1.173V11.5h7v-2H5.5z"/>
-</g>
-<g>
-	<path fill="#808080" d="M12.5,8.5c-2.209,0-4,1.791-4,4c0,2.207,1.791,4,4,4c2.207,0,4-1.793,4-4C16.5,10.291,14.707,8.5,12.5,8.5"
-		/>
-	<g>
-		<path fill="#FFFFFF" d="M12,14.5c-0.132,0-0.261-0.051-0.354-0.145l-1.5-1.502c-0.195-0.194-0.195-0.512,0-0.707
-			s0.512-0.195,0.707,0l1.111,1.113l2.15-2.58c0.178-0.213,0.49-0.24,0.705-0.064c0.213,0.177,0.238,0.492,0.064,0.705l-2.5,2.999
-			c-0.092,0.108-0.223,0.175-0.363,0.18C12.015,14.5,12.008,14.5,12,14.5z"/>
-	</g>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/Syncing_Animated_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/Syncing_Animated_16px.svg
deleted file mode 100644
index f9a47e7a8..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/Syncing_Animated_16px.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0.5 0.5 16 16" enable-background="new 0.5 0.5 16 16" xml:space="preserve">
-<!-- TOP ARROW -->	 
-<rect id="TopArrow_1Block"  x="3.5" y="4.5" fill="#333333" width="1" height="2" fill-opacity="1"> 
-	<animate attributeType="XML" attributeName="fill-opacity" from=".3" to="1" begin=".1s" dur=".5s" repeatCount="indefinite" />
-	<animate attributeType="XML" attributeName="fill-opacity" from="1" to=".3" begin=".5s" dur=".5s" repeatCount="indefinite" />
-</rect>
-	
-<rect id="TopArrow_2Block" x="5.5" y="4.5" fill="#333333" width="1" height="2" fill-opacity=".5"> 
-	<animate attributeType="XML" attributeName="fill-opacity" from=".3" to="1" begin=".2s" dur=".5s" repeatCount="indefinite" />
-	<animate attributeType="XML" attributeName="fill-opacity" from="1" to=".3" begin=".6s" dur=".5s" repeatCount="indefinite" />
-</rect>
-
-
-<rect id="TopArrow_3Block" x="7.5" y="4.5" fill="#333333" width="3" height="2" fill-opacity="1"> 
-	<animate attributeType="XML" attributeName="fill-opacity" from=".3" to="1" begin=".3s" dur=".5s" repeatCount="indefinite" />
-	<animate attributeType="XML" attributeName="fill-opacity" from="1" to=".3" begin=".7s" dur=".5s" repeatCount="indefinite" />
-</rect>
-
-<path id="TopArrow_TriangleButt" fill="#333333" fill-opacity="1" d="M11.986,2.73c-0.25-0.224-0.625-0.292-0.948-0.17C10.713,2.682,10.5,2.967,10.5,3.284v1.172V4.5v2v0.044
-	v1.172c0.001,0.212,0.096,0.411,0.255,0.556c0.078,0.069,0.175,0.127,0.283,0.168c0.323,0.121,0.701,0.055,0.948-0.17L12.5,7.808
-	V3.192L11.986,2.73z"> 
-	<animate attributeType="XML" attributeName="fill-opacity" from=".3" to="1" begin=".4s" dur=".5s" repeatCount="indefinite" />
-	<animate attributeType="XML" attributeName="fill-opacity" from="1" to=".3" begin=".8s" dur=".5s" repeatCount="indefinite" />
-</path>	
-
-<path id="TopArrow_TriangleTip" fill="#333333" fill-opacity="1" d="M14.245,4.763L12.5,3.192v4.615l1.746-1.571C14.586,5.935,14.585,5.069,14.245,4.763z">
-	<animate attributeType="XML" attributeName="fill-opacity" from=".3" to="1" begin=".4s" dur=".5s" repeatCount="indefinite" />
-	<animate attributeType="XML" attributeName="fill-opacity" from="1" to=".3" begin=".8s" dur=".5s" repeatCount="indefinite" />
-</path>
-
-
-<!-- BOTTOM ARROW -->
-
-<rect id="BottomArrow_1Block" x="10.5" y="9.5" fill="#333333" width="1" height="2" fill-opacity="1"> 
-	<animate attributeType="XML" attributeName="fill-opacity" from=".3" to="1" begin=".1s" dur=".5s" repeatCount="indefinite" />
-	<animate attributeType="XML" attributeName="fill-opacity" from="1" to=".3" begin=".5s" dur=".5s" repeatCount="indefinite" />
-</rect>
-
-<rect id="BottomArrow_2Block" x="8.5" y="9.5" fill="#333333" width="1" height="2" fill-opacity="1"> 
-	<animate attributeType="XML" attributeName="fill-opacity" from=".3" to="1" begin=".2s" dur=".5s" repeatCount="indefinite" />
-	<animate attributeType="XML" attributeName="fill-opacity" from="1" to=".3" begin=".6s" dur=".5s" repeatCount="indefinite" />
-</rect>
-
-<rect id="BottomArrow_3Block"  x="4.5" y="9.5" fill="#333333" width="3" height="2" fill-opacity="1"> 
-	<animate attributeType="XML" attributeName="fill-opacity" from=".3" to="1" begin=".3s" dur=".5s" repeatCount="indefinite" />
-	<animate attributeType="XML" attributeName="fill-opacity" from="1" to=".3" begin=".7s" dur=".5s" repeatCount="indefinite" />
-</rect>
-
-<path id="BottomArrow_TriangleButt" fill="#333333" fill-opacity="1" d="M4.247,7.728C4.167,7.658,4.071,7.601,3.962,7.56C3.639,7.438,3.261,7.505,3.014,7.73L2.5,8.192v4.616
-	l0.514,0.462c0.25,0.228,0.625,0.293,0.949,0.17C4.29,13.318,4.5,13.033,4.5,12.717v-1.173V11.5v-2V9.456V8.283
-	C4.5,8.07,4.406,7.872,4.247,7.728z"> 
-	<animate attributeType="XML" attributeName="fill-opacity" from=".3" to="1" begin=".4s" dur=".5s" repeatCount="indefinite" />
-	<animate attributeType="XML" attributeName="fill-opacity" from="1" to=".3" begin=".8s" dur=".5s" repeatCount="indefinite" />
-</path>	
-	
-	
-<path id="BottomArrow_TriangleTip" fill="#333333" fill-opacity="1" d="M0.754,9.762c-0.338,0.304-0.338,1.162,0,1.475L2.5,12.808V8.192L0.754,9.762z">
-	<animate attributeType="XML" attributeName="fill-opacity" from=".3" to="1" begin=".4s" dur=".5s" repeatCount="indefinite" />
-	<animate attributeType="XML" attributeName="fill-opacity" from="1" to=".3" begin=".8s" dur=".5s" repeatCount="indefinite" />
-</path>
-
-
-
-
-
-
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/Syncing_Static_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/Syncing_Static_16px.svg
deleted file mode 100644
index 1e2c7ea7d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/Syncing_Static_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0.5 0.5 16 16" enable-background="new 0.5 0.5 16 16" xml:space="preserve">
-<g>
-	<rect x="4.5" y="4.5" fill="#808080" width="1" height="2"/>
-	<path fill="#808080" d="M15.244,4.762l0.205,0.185L12.986,2.73c-0.25-0.224-0.625-0.292-0.948-0.17
-		C11.713,2.682,11.5,2.967,11.5,3.284v1.172V4.5h-3v2h3v0.044v1.172c0.001,0.212,0.096,0.411,0.255,0.556
-		c0.078,0.069,0.175,0.127,0.283,0.168c0.323,0.121,0.701,0.054,0.948-0.17l2.26-2.033C15.586,5.934,15.585,5.068,15.244,4.762z"/>
-	<rect x="6.5" y="4.5" fill="#808080" width="1" height="2"/>
-</g>
-<g>
-	<path fill="#808080" d="M5.5,9.456V8.283c0-0.213-0.095-0.411-0.254-0.555C5.167,7.658,5.071,7.601,4.962,7.56
-		c-0.324-0.122-0.701-0.054-0.949,0.17L1.754,9.762c-0.34,0.305-0.339,1.17,0.002,1.479l-0.205-0.186l2.462,2.215
-		c0.25,0.227,0.625,0.293,0.949,0.17C5.289,13.318,5.5,13.033,5.5,12.717v-1.173V11.5h3v-2h-3V9.456z"/>
-	<rect x="9.5" y="9.5" fill="#808080" width="1" height="2"/>
-	<rect x="11.5" y="9.5" fill="#808080" width="1" height="2"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/WindowMaximize_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/WindowMaximize_black_16px.svg
deleted file mode 100644
index 19d1f9724..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/WindowMaximize_black_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1797.971 16 16" enable-background="new 13 1797.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M26.5,1800.97c-0.275,0-10.725,0-11,0s-0.5,0.225-0.5,0.5s0,7.725,0,8s0.225,0.5,0.5,0.5c0.22,0,10.78,0,11,0
-	c0.275,0,0.5-0.225,0.5-0.5s0-7.725,0-8S26.775,1800.97,26.5,1800.97z M26,1808.97H16v-6h10V1808.97z"/>
-<rect x="13" y="1797.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="15.999"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/WindowMinimize_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/WindowMinimize_black_16px.svg
deleted file mode 100644
index 276b01ea7..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/WindowMinimize_black_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1765.971 16 16" enable-background="new 13 1765.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M27,1771.47c0-0.275-0.225-0.5-0.5-0.5s-9.725,0-10,0s-0.5,0.225-0.5,0.5s0,1.725,0,2s0.225,0.5,0.5,0.5c0.22,0,9.78,0,10,0
-	c0.275,0,0.5-0.225,0.5-0.5S27,1771.746,27,1771.47z"/>
-<rect x="13" y="1765.971" display="none" opacity="0.2" fill="#E94E47" width="16" height="15.999"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/X_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/X_black_16px.svg
deleted file mode 100644
index 4b1869721..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/X_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 325.971 16 16" enable-background="new 13 325.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M22.477,333.971l2.218-2.216c0.407-0.408,0.407-1.07,0-1.478c-0.409-0.408-1.07-0.408-1.478,0L21,332.494l-2.216-2.216
-	c-0.408-0.408-1.069-0.408-1.477,0c-0.408,0.407-0.408,1.069,0,1.478l2.216,2.216l-2.216,2.217c-0.408,0.407-0.408,1.068,0,1.477
-	c0.204,0.204,0.471,0.306,0.739,0.306c0.268,0,0.536-0.102,0.738-0.306L21,335.448l2.218,2.217c0.203,0.204,0.472,0.306,0.739,0.306
-	c0.265,0,0.533-0.102,0.739-0.306c0.407-0.409,0.407-1.07,0-1.477L22.477,333.971z"/>
-<rect x="13" y="325.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/X_blue_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/X_blue_16px.svg
deleted file mode 100644
index d27dff9cf..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/X_blue_16px.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0.001 16 16" enable-background="new 0 0.001 16 16" xml:space="preserve">
-<path fill="#0053a9" d="M9.477,8l2.218-2.216c0.407-0.408,0.407-1.07,0-1.478c-0.409-0.408-1.07-0.408-1.478,0L8,6.522L5.783,4.306
-	c-0.408-0.408-1.069-0.408-1.477,0c-0.408,0.407-0.408,1.069,0,1.478L6.522,8l-2.216,2.217c-0.408,0.407-0.408,1.068,0,1.477
-	C4.51,11.898,4.777,12,5.045,12c0.268,0,0.536-0.102,0.738-0.306L8,9.477l2.218,2.217C10.42,11.898,10.689,12,10.956,12
-	c0.265,0,0.533-0.102,0.739-0.306c0.407-0.409,0.407-1.07,0-1.477L9.477,8z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/X_green_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/X_green_16px.svg
deleted file mode 100644
index 07d9db130..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/X_green_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1509.971 16 16" enable-background="new 13 1509.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path fill="#89BA17" d="M22.477,1517.971l2.218-2.216c0.407-0.408,0.407-1.07,0-1.478c-0.409-0.408-1.07-0.408-1.478,0L21,1516.494
-	l-2.216-2.216c-0.408-0.408-1.069-0.408-1.477,0c-0.408,0.407-0.408,1.069,0,1.478l2.216,2.216l-2.216,2.217
-	c-0.408,0.407-0.408,1.068,0,1.477c0.204,0.204,0.471,0.306,0.739,0.306c0.268,0,0.536-0.102,0.738-0.306l2.216-2.217l2.218,2.217
-	c0.203,0.204,0.472,0.306,0.739,0.306c0.265,0,0.533-0.102,0.739-0.306c0.407-0.409,0.407-1.07,0-1.477L22.477,1517.971z"/>
-<rect x="13" y="1509.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/X_orange_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/X_orange_16px.svg
deleted file mode 100644
index e923fae5d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/X_orange_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1573.971 16 16" enable-background="new 13 1573.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path fill="#F08A00" d="M22.477,1581.971l2.218-2.216c0.407-0.408,0.407-1.07,0-1.478c-0.409-0.408-1.07-0.408-1.478,0L21,1580.494
-	l-2.216-2.216c-0.408-0.408-1.069-0.408-1.477,0c-0.408,0.407-0.408,1.069,0,1.478l2.216,2.216l-2.216,2.217
-	c-0.408,0.407-0.408,1.068,0,1.477c0.204,0.204,0.471,0.306,0.739,0.306c0.268,0,0.536-0.102,0.738-0.306l2.216-2.217l2.218,2.217
-	c0.203,0.204,0.472,0.306,0.739,0.306c0.265,0,0.533-0.102,0.739-0.306c0.407-0.409,0.407-1.07,0-1.477L22.477,1581.971z"/>
-<rect x="13" y="1573.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/X_paleBlue_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/X_paleBlue_16px.svg
deleted file mode 100644
index cbc03f710..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/X_paleBlue_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1605.971 16 16" enable-background="new 13 1605.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path fill="#00A9D4" d="M22.477,1613.97l2.218-2.216c0.407-0.408,0.407-1.07,0-1.478c-0.409-0.408-1.07-0.408-1.478,0L21,1612.492
-	l-2.216-2.216c-0.408-0.408-1.069-0.408-1.477,0c-0.408,0.407-0.408,1.069,0,1.478l2.216,2.216l-2.216,2.217
-	c-0.408,0.407-0.408,1.068,0,1.477c0.204,0.204,0.471,0.306,0.739,0.306c0.268,0,0.536-0.102,0.738-0.306l2.216-2.217l2.218,2.217
-	c0.203,0.204,0.472,0.306,0.739,0.306c0.265,0,0.533-0.102,0.739-0.306c0.407-0.409,0.407-1.07,0-1.477L22.477,1613.97z"/>
-<rect x="13" y="1605.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/X_red_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/X_red_16px.svg
deleted file mode 100644
index b3c5a56f4..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/X_red_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1541.971 16 16" enable-background="new 13 1541.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path fill="#E32219" d="M22.477,1549.97l2.218-2.216c0.407-0.408,0.407-1.07,0-1.478c-0.409-0.408-1.07-0.408-1.478,0L21,1548.492
-	l-2.216-2.216c-0.408-0.408-1.069-0.408-1.477,0c-0.408,0.407-0.408,1.069,0,1.478l2.216,2.216l-2.216,2.217
-	c-0.408,0.407-0.408,1.068,0,1.477c0.204,0.204,0.471,0.306,0.739,0.306c0.268,0,0.536-0.102,0.738-0.306l2.216-2.217l2.218,2.217
-	c0.203,0.204,0.472,0.306,0.739,0.306c0.265,0,0.533-0.102,0.739-0.306c0.407-0.409,0.407-1.07,0-1.477L22.477,1549.97z"/>
-<rect x="13" y="1541.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/X_yellow_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/X_yellow_16px.svg
deleted file mode 100644
index b5570757e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/X_yellow_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1637.971 16 16" enable-background="new 13 1637.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path fill="#FABB00" d="M22.477,1645.97l2.218-2.216c0.407-0.408,0.407-1.07,0-1.478c-0.409-0.408-1.07-0.408-1.478,0L21,1644.492
-	l-2.216-2.216c-0.408-0.408-1.069-0.408-1.477,0c-0.408,0.407-0.408,1.069,0,1.478l2.216,2.216l-2.216,2.217
-	c-0.408,0.407-0.408,1.068,0,1.477c0.204,0.204,0.471,0.306,0.739,0.306c0.268,0,0.536-0.102,0.738-0.306l2.216-2.217l2.218,2.217
-	c0.203,0.204,0.472,0.306,0.739,0.306c0.265,0,0.533-0.102,0.739-0.306c0.407-0.409,0.407-1.07,0-1.477L22.477,1645.97z"/>
-<rect x="13" y="1637.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/accessSettings_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/accessSettings_black_16px.svg
deleted file mode 100644
index 9c65207a9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/accessSettings_black_16px.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="13" y="2277.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<g>
-	<g>
-		<g>
-			<g>
-				<path d="M14.827,12.743c0.021-0.081,0.094-0.136,0.176-0.136H16v-1.215h-0.997c-0.082,0-0.155-0.055-0.176-0.135
-					c-0.067-0.258-0.169-0.506-0.304-0.734c-0.041-0.068-0.029-0.158,0.027-0.217L15.257,9.6L14.4,8.745l-0.705,0.704
-					c-0.06,0.059-0.149,0.068-0.219,0.027c-0.229-0.134-0.478-0.234-0.733-0.303c-0.08-0.02-0.136-0.094-0.136-0.176V8.001h-1.213
-					v0.997c0,0.082-0.056,0.156-0.137,0.176C11,9.241,10.755,9.343,10.523,9.477c-0.07,0.041-0.16,0.03-0.219-0.027L9.602,8.744
-					L8.743,9.6l0.705,0.707c0.059,0.06,0.071,0.148,0.028,0.219c-0.135,0.229-0.234,0.477-0.305,0.733
-					c-0.021,0.08-0.093,0.136-0.177,0.136H8v1.213h0.996c0.084,0,0.154,0.056,0.177,0.137c0.069,0.257,0.17,0.503,0.304,0.732
-					c0.043,0.069,0.03,0.159-0.027,0.219L8.744,14.4l0.857,0.857l0.705-0.705c0.057-0.059,0.146-0.068,0.217-0.027
-					c0.231,0.134,0.478,0.234,0.734,0.303c0.081,0.021,0.137,0.094,0.137,0.176V16h1.213v-0.997c0-0.082,0.056-0.155,0.136-0.176
-					c0.257-0.067,0.504-0.169,0.733-0.304c0.068-0.041,0.159-0.029,0.219,0.028l0.705,0.705l0.856-0.858l-0.705-0.703
-					c-0.058-0.061-0.067-0.149-0.026-0.219C14.658,13.246,14.76,13,14.827,12.743z M11.999,13.477c-0.813,0-1.476-0.66-1.476-1.476
-					s0.662-1.478,1.476-1.478c0.815,0,1.478,0.662,1.478,1.478C13.477,12.814,12.814,13.477,11.999,13.477z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<polygon points="6,6 0,12 0,15 2,15 2,13 4,13 4,11 6,11 9,8 "/>
-<path d="M12.682,1.319c-1.759-1.758-4.607-1.758-6.365-0.002c-1.758,1.759-1.758,4.608,0,6.366
-	c1.76,1.756,4.607,1.756,6.365,0C14.439,5.924,14.438,3.076,12.682,1.319z M9.641,6.611c-1.245,0-2.251-1.009-2.25-2.25
-	C7.389,3.119,8.396,2.11,9.641,2.11c1.242,0,2.25,1.007,2.25,2.25C11.891,5.602,10.883,6.609,9.641,6.611z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/accessSettings_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/accessSettings_white_16px.svg
deleted file mode 100644
index fda71190b..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/accessSettings_white_16px.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<polygon fill="#FFFFFF" points="6,4.999 0,10.999 0,12.999 2,12.999 2,10.999 4,10.999 4,8.999 6,8.999 8,6.636 "/>
-<path fill="#FFFFFF" d="M11.828,1.172C10.267-0.39,7.732-0.39,6.172,1.17c-1.563,1.563-1.563,4.096,0,5.658
-	c1.564,1.562,4.096,1.562,5.658,0S13.391,2.733,11.828,1.172 M9.877,4.375c-0.692,0-1.251-0.561-1.25-1.25
-	c-0.001-0.689,0.558-1.25,1.25-1.25c0.689,0,1.248,0.56,1.248,1.25C11.127,3.814,10.566,4.374,9.877,4.375"/>
-<path fill="#FFFFFF" d="M14.826,12.743c0.021-0.081,0.094-0.136,0.176-0.136H16v-1.213h-0.998c-0.082,0-0.154-0.057-0.176-0.137
-	c-0.066-0.258-0.168-0.506-0.303-0.733c-0.041-0.069-0.029-0.159,0.027-0.218L15.256,9.6l-0.857-0.855l-0.705,0.704
-	c-0.059,0.058-0.148,0.067-0.219,0.026c-0.229-0.133-0.477-0.233-0.732-0.302c-0.08-0.019-0.137-0.093-0.137-0.175V8h-1.213v0.998
-	c0,0.082-0.055,0.156-0.135,0.175C11,9.241,10.754,9.342,10.523,9.475c-0.07,0.041-0.16,0.031-0.218-0.026L9.601,8.744L8.743,9.6
-	l0.705,0.707c0.059,0.059,0.071,0.148,0.028,0.218C9.343,10.752,9.242,11,9.173,11.258c-0.021,0.08-0.093,0.137-0.177,0.137H8v1.213
-	h0.996c0.084,0,0.155,0.055,0.177,0.136c0.069,0.256,0.17,0.503,0.304,0.733c0.043,0.068,0.03,0.158-0.028,0.219l-0.705,0.704
-	l0.857,0.857l0.705-0.705c0.058-0.058,0.147-0.068,0.218-0.027c0.23,0.134,0.477,0.234,0.734,0.303
-	c0.08,0.021,0.135,0.093,0.135,0.175v0.997h1.213v-0.997c0-0.082,0.057-0.154,0.137-0.175c0.256-0.068,0.504-0.169,0.732-0.303
-	c0.07-0.041,0.16-0.03,0.219,0.027l0.705,0.705l0.857-0.857l-0.705-0.704c-0.057-0.061-0.068-0.15-0.027-0.219
-	C14.658,13.246,14.76,12.999,14.826,12.743 M11.998,13.477c-0.813,0-1.475-0.661-1.475-1.477c0-0.814,0.662-1.476,1.475-1.476
-	c0.816,0,1.479,0.661,1.479,1.476C13.477,12.815,12.814,13.477,11.998,13.477"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/access_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/access_black_16px.svg
deleted file mode 100644
index 49249284d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/access_black_16px.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="13" y="2757.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<polygon points="7,6 1,12 1,15 3,15 3,13 5,13 5,11 7,11 10,8 "/>
-<path d="M13.682,1.318C11.923-0.44,9.074-0.44,7.317,1.316c-1.758,1.76-1.758,4.607,0,6.365
-	c1.76,1.758,4.607,1.758,6.365,0S15.438,3.076,13.682,1.318z M10.641,6.61c-1.246,0-2.251-1.008-2.25-2.25
-	c-0.001-1.241,1.004-2.25,2.25-2.25c1.243,0,2.25,1.007,2.25,2.25C12.891,5.602,11.884,6.609,10.641,6.61z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/access_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/access_white_16px.svg
deleted file mode 100644
index 83301c826..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/access_white_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1.5 -1.5 16 16" enable-background="new -1.5 -1.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M11.828,1.173c-1.563-1.563-4.096-1.563-5.656-0.002C4.963,2.38,4.701,4.165,5.361,5.638L0,10.999v1.999h2
-	v-2h2v-2h2l1.218-1.438c1.499,0.75,3.362,0.518,4.612-0.732C13.393,5.266,13.393,2.733,11.828,1.173z M9,5.999
-	c-1.107,0-2.002-0.896-2-2c-0.001-1.103,0.893-2,2-2c1.105,0,2,0.896,2,2C11,5.103,10.107,5.998,9,5.999z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/acknowledgeAlarm.svg b/client/client-editor/src/main/resources/webapp/resources/16px/acknowledgeAlarm.svg
deleted file mode 100644
index 869823661..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/acknowledgeAlarm.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M12,7c0-1.709-0.984-2.682-2.304-2.93C9.343,2.229,8.717,1,8,1S6.657,2.229,6.304,4.07
-			C4.984,4.318,4,5.291,4,7c0,3-2,3.76-2,4.5C2,12.881,4.687,14,8,14s6-1.119,6-2.5C14,10.76,12,10,12,7z"/>
-		<path fill="#1D1D1B" d="M10,15.25C10,15.664,9.664,16,9.25,16h-1.5C7.336,16,7,15.664,7,15.25l0,0c0-0.414,0.336-0.75,0.75-0.75
-			h1.5C9.664,14.5,10,14.836,10,15.25L10,15.25z"/>
-	</g>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/acknowledgeAlarm_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/acknowledgeAlarm_white.svg
deleted file mode 100644
index 3cb99b6ae..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/acknowledgeAlarm_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 15"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_acknowledgeAlarm_white</title><path class="cls-1" d="M10.5,6A2.74,2.74,0,0,0,8.2,3.07C7.84,1.23,7.22,0,6.5,0S5.16,1.23,4.8,3.07A2.74,2.74,0,0,0,2.5,6c0,3-2,3.76-2,4.5,0,1.38,2.69,2.5,6,2.5s6-1.12,6-2.5C12.5,9.76,10.5,9,10.5,6Z" transform="translate(-0.5)"/><path class="cls-1" d="M8.5,14.25a.75.75,0,0,1-.75.75H6.25a.75.75,0,0,1-.75-.75h0a.75.75,0,0,1,.75-.75h1.5A.75.75,0,0,1,8.5,14.25Z" transform="translate(-0.5)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/activate_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/activate_black_16px.svg
deleted file mode 100644
index 84d4a9dd1..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/activate_black_16px.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path d="M5.219,8.943c0.012,0.008,0.024,0.015,0.037,0.022c0.206,0.13,0.418,0.248,0.643,0.339c0.078,0.033,0.16,0.053,0.239,0.082
-	C6.31,9.445,6.479,9.51,6.657,9.545C6.93,9.604,7.211,9.637,7.5,9.637s0.571-0.033,0.844-0.092c0.18-0.035,0.347-0.1,0.521-0.158
-	c0.078-0.029,0.161-0.049,0.239-0.082c0.223-0.092,0.434-0.209,0.641-0.339c0.013-0.007,0.026-0.014,0.037-0.022
-	c0.221-0.14,0.426-0.302,0.618-0.48c0,0,0,0,0-0.001c0.961-0.883,1.579-2.179,1.579-3.643C11.979,2.157,9.974,0,7.5,0
-	C5.028,0,3.022,2.157,3.022,4.819C3.022,6.579,3.91,8.103,5.219,8.943z"/>
-<path d="M12.68,8.484c-1.273,1.997-3.135,3.266-5.211,3.266c-2.076,0-3.936-1.269-5.209-3.266c-1.502,1.497-1.242,3.13-1.242,4.934
-	c0,0.516,0,1.146,0,1.146C1.017,15.116,1.916,16,2.434,16h2.833c0.001,0,0.003,0,0.003,0c0.568,0,1.199,0,2.198,0
-	c1.001,0,1.631,0,2.201,0h0.002h2.863c0.489,0,1.4-0.938,1.4-1.465c0,0,0-0.719,0-1.234C13.935,11.497,14.183,9.979,12.68,8.484z"/>
-<path display="none" fill="#89BA17" d="M15.726,12.401c0.203-0.138,0.22-0.674,0-0.811l0,0l0,0c0,0-5.985-3.6-6.144-3.6
-	C9.265,7.992,9.01,8.247,9.01,8.563v6.865C9.01,15.744,9.265,16,9.582,16C9.742,16,15.726,12.401,15.726,12.401z"/>
-<path display="none" fill="#E32219" d="M14.864,8.001H9.181c-0.625,0-1.136,0.516-1.136,1.144v5.711C8.045,15.484,8.556,16,9.181,16
-	h5.684C15.489,16,16,15.484,16,14.856V9.146C16,8.518,15.489,8.001,14.864,8.001z"/>
-<path display="none" fill="#E32219" d="M13.729,12.516l1.931-1.931c0.356-0.356,0.356-0.933,0-1.287
-	c-0.356-0.355-0.932-0.355-1.287,0l-1.93,1.932l-1.931-1.932c-0.357-0.355-0.933-0.355-1.286,0c-0.356,0.354-0.356,0.931,0,1.287
-	l1.93,1.931l-1.93,1.932c-0.356,0.354-0.356,0.93,0,1.286C9.403,15.91,9.637,16,9.87,16c0.232,0,0.465-0.09,0.643-0.267l1.931-1.931
-	l1.93,1.931C14.551,15.91,14.783,16,15.017,16c0.232,0,0.467-0.09,0.644-0.267c0.356-0.356,0.356-0.933,0-1.286L13.729,12.516z"/>
-<circle display="none" fill="#E32219" cx="12" cy="12" r="4"/>
-<path fill="#FFFFFF" d="M12.873,12.002l1.311-1.309c0.188-0.195,0.188-0.51,0-0.701l-0.176-0.176c-0.193-0.189-0.508-0.189-0.697,0
-	L12,11.127l-1.311-1.311c-0.191-0.193-0.504-0.193-0.697,0L9.816,9.992c-0.189,0.191-0.189,0.506,0,0.701l1.311,1.309l-1.311,1.311
-	c-0.189,0.191-0.189,0.504,0,0.697l0.176,0.174c0.193,0.193,0.506,0.193,0.697,0L12,12.875l1.311,1.309
-	c0.189,0.193,0.504,0.193,0.697,0l0.176-0.174c0.188-0.193,0.188-0.506,0-0.697L12.873,12.002z"/>
-<g>
-	<circle fill="#89BA17" cx="11.973" cy="11.973" r="4.027"/>
-	<path display="none" fill="#FFFFFF" d="M11.473,14.532c-0.152,0-0.299-0.06-0.407-0.169L9.34,12.638
-		c-0.224-0.225-0.224-0.59,0-0.813c0.225-0.225,0.59-0.225,0.813,0l1.28,1.279l2.474-2.967c0.204-0.244,0.566-0.277,0.811-0.073
-		c0.244,0.203,0.276,0.565,0.073,0.81l-2.876,3.451c-0.104,0.125-0.255,0.2-0.416,0.207C11.49,14.531,11.481,14.532,11.473,14.532z"
-		/>
-	<path fill="#FFFFFF" d="M14.014,12.154c0.113-0.076,0.122-0.375,0-0.45l0,0l0,0c0,0-3.331-2.004-3.42-2.004
-		c-0.177,0-0.317,0.142-0.317,0.317v3.821c0,0.177,0.141,0.318,0.317,0.318C10.684,14.157,14.014,12.154,14.014,12.154z"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/activate_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/activate_white.svg
deleted file mode 100644
index df083b51f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/activate_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 16"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#89ba17;}</style></defs><title>ebIcon_activate_white</title><path class="cls-1" d="M5.22,8.94l0,0a4.07,4.07,0,0,0,.64.34l.24.08a3.86,3.86,0,0,0,2.21.16,4.16,4.16,0,0,0,.52-.16l.24-.08A4.27,4.27,0,0,0,9.74,9l0,0a4.28,4.28,0,0,0,.62-.48h0A4.93,4.93,0,0,0,12,4.82,4.66,4.66,0,0,0,7.5,0,4.66,4.66,0,0,0,3,4.82,4.88,4.88,0,0,0,5.22,8.94Z" transform="translate(-1)"/><path class="cls-1" d="M12.68,8.48a6.34,6.34,0,0,1-5.21,3.27A6.33,6.33,0,0,1,2.26,8.48C.76,10,1,11.61,1,13.42v1.15A1.93,1.93,0,0,0,2.43,16h10.1a2,2,0,0,0,1.4-1.47V13.3C13.93,11.5,14.18,10,12.68,8.48Z" transform="translate(-1)"/><circle class="cls-2" cx="10.97" cy="11.97" r="4.03"/><path class="cls-1" d="M14,12.15a.33.33,0,0,0,0-.45h0s-3.33-2-3.42-2a.32.32,0,0,0-.32.32v3.82a.32.32,0,0,0,.32.32C10.68,14.16,14,12.15,14,12.15Z" transform="translate(-1)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/activity_16px_black.svg b/client/client-editor/src/main/resources/webapp/resources/16px/activity_16px_black.svg
deleted file mode 100644
index 5c546bc6a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/activity_16px_black.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="15px" viewBox="0 0 16 15" enable-background="new 0 0 16 15" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M15,4c0,0.55-0.45,1-1,1H2C1.45,5,1,4.55,1,4V3c0-0.55,0.45-1,1-1h12c0.55,0,1,0.45,1,1V4z"/>
-	</g>
-	<g>
-		<path fill="#1D1D1B" d="M15,8c0,0.55-0.45,1-1,1H2C1.45,9,1,8.55,1,8V7c0-0.55,0.45-1,1-1h12c0.55,0,1,0.45,1,1V8z"/>
-	</g>
-	<g>
-		<path fill="#1D1D1B" d="M15,12c0,0.55-0.45,1-1,1H2c-0.55,0-1-0.45-1-1v-1c0-0.55,0.45-1,1-1h12c0.55,0,1,0.45,1,1V12z"/>
-	</g>
-	<rect x="2" y="3" fill="#B0B0AF" width="6" height="1"/>
-	<rect x="2" y="7" fill="#B0B0AF" width="11" height="1"/>
-	<rect x="2" y="11" fill="#B0B0AF" width="3" height="1"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/addToFolder_black.svg b/client/client-editor/src/main/resources/webapp/resources/16px/addToFolder_black.svg
deleted file mode 100644
index 99519e15e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/addToFolder_black.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<path fill="#1D1D1B" d="M14,10h-2V8c0-0.55-0.451-1-1-1c-0.551,0-1,0.45-1,1v2H8c-0.55,0-1,0.45-1,0.999C7,11.55,7.45,12,8,12h2v2
-		c0,0.55,0.449,1,1,1c0.549,0,1-0.45,1-1v-2h2c0.549,0,1-0.45,1-1.001C15,10.45,14.549,10,14,10z M13,11.002C13,11.062,13,11,13,11
-		V11.002z"/>
-	<path fill="#1D1D1B" d="M12.987,8.236L13,8.201V8C13,7.957,12.99,8.279,12.987,8.236z"/>
-	<path fill="#1D1D1B" d="M6.001,11h-2.43c-0.486,0-0.783-0.371-0.661-0.843l0.961-4.06C3.992,5.627,4.49,5,4.977,5H13
-		c0.482,0,0.866,0.634,0.746,1.104L13,8.201V9h1c0.002,0,0.004,0,0.006,0c0.213-1,0.506-1.77,0.922-3.224
-		C15.176,4.999,14.85,3,12.85,3c-0.117,0-0.506,0-0.833,0c0-1-0.956-2-3.124-2C8.284,1,5.477,1,4.017,1C1.977,1,1,2.084,1,4
-		c0,0.672,0,6.591,0,7c0,0.553,0.381,1,0.934,1c0.203,0,2.171,0,4.344,0C6.11,12,6.006,11,6.001,11z"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/addToFolder_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/addToFolder_white.svg
deleted file mode 100644
index 9ec228b85..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/addToFolder_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebicon_addToFolder_white</title><path class="cls-1" d="M14,11H12V9a1,1,0,0,0-2,0v2H8a1,1,0,1,0,0,2h2v2a1,1,0,0,0,2,0V13h2a1,1,0,1,0,0-2Zm-1,1h0Z" transform="translate(-1 -2)"/><path class="cls-1" d="M6,12H3.57a.64.64,0,0,1-.66-.84l1-4.06C4,6.63,4.49,6,5,6h8a.92.92,0,0,1,.75,1.1l-1,2.9H14c.21-1,.51-1.77.92-3.22A2.17,2.17,0,0,0,12.85,4H12c0-1-1-2-3.12-2H4A2.68,2.68,0,0,0,1,5v7a.94.94,0,0,0,.93,1H6.28C6.11,13,6,12,6,12Z" transform="translate(-1 -2)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/add_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/add_black_16px.svg
deleted file mode 100644
index a536d4733..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/add_black_16px.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path d="M2.342,2.343c-3.123,3.124-3.123,8.19,0,11.313c3.124,3.125,8.191,3.125,11.314,0c3.125-3.123,3.125-8.189,0-11.313
-	C10.533-0.781,5.466-0.781,2.342,2.343 M12,6.999c0.553,0,1,0.447,1,1c0,0.276-0.111,0.526-0.293,0.707S12.275,8.998,12,8.998
-	L8.998,8.999V12C9,12.275,8.889,12.525,8.707,12.705c-0.182,0.182-0.432,0.293-0.708,0.293c-0.552,0-0.999-0.447-1-1V8.999H4
-	c-0.553-0.001-1-0.448-1-1c0-0.552,0.447-1,1-1h2.999v-3c0-0.553,0.447-1,1-1c0.554,0,1.001,0.447,1.001,1L8.998,7L12,6.999z"/>
-<path fill="#B1B3B4" d="M35.438,17.073H21.724c-0.632,0-1.143,0.516-1.143,0.878v7.625c0,0.029,0.023,0.057,0.029,0.084
-	c0.303,4.143,3.75,7.413,7.971,7.413s7.668-3.271,7.971-7.413c0.006-0.029,0.029-0.055,0.029-0.086v-7.646
-	C36.581,17.564,36.067,17.073,35.438,17.073z"/>
-<g>
-	<g>
-		<ellipse fill="#B1B3B4" cx="40.287" cy="5.099" rx="3.705" ry="3.87"/>
-	</g>
-	<rect x="46.185" y="-2.93" fill="#B1B3B4" width="5.845" height="6.104"/>
-	<path fill="#B1B3B4" d="M52.029,3.682h-5.845c-0.269,0-0.485-0.227-0.485-0.51V-2.93c0-0.281,0.217-0.508,0.485-0.508h5.845
-		c0.271,0,0.488,0.227,0.488,0.508v6.104C52.518,3.455,52.3,3.682,52.029,3.682z M46.673,2.664h4.87v-5.085h-4.87V2.664z"/>
-	<path fill="#B1B3B4" d="M52.089,5.375h-5.899c-0.271,0-0.49,0.231-0.49,0.393v3.426c0,0.013,0.009,0.025,0.012,0.038
-		c0.131,1.862,1.613,3.331,3.43,3.331c1.814,0,3.298-1.469,3.428-3.331c0.002-0.015,0.013-0.025,0.013-0.038V5.758
-		C52.581,5.594,52.359,5.375,52.089,5.375z"/>
-</g>
-<g>
-	<g>
-		<path d="M37.771-18.239c0,0.825-0.675,1.5-1.5,1.5h-13c-0.825,0-1.5-0.675-1.5-1.5v-13c0-0.825,0.675-1.5,1.5-1.5h13
-			c0.825,0,1.5,0.675,1.5,1.5V-18.239z"/>
-	</g>
-	<g>
-		
-			<circle fill="none" stroke="#FFFFFF" stroke-width="0.75" stroke-linecap="round" stroke-miterlimit="10" stroke-dasharray="2.5714,2.5714" cx="29.772" cy="-24.739" r="6.67"/>
-	</g>
-	<circle fill="#FFFFFF" stroke="#FFFFFF" stroke-linecap="round" stroke-miterlimit="10" cx="29.771" cy="-24.739" r="2.325"/>
-</g>
-<g>
-	<g>
-		<path d="M68.582-18.894c0,0.825-0.676,1.5-1.5,1.5h-13c-0.826,0-1.5-0.675-1.5-1.5v-13c0-0.825,0.674-1.5,1.5-1.5h13
-			c0.824,0,1.5,0.675,1.5,1.5V-18.894z"/>
-	</g>
-	<g>
-		<g>
-			<path fill="#FFFFFF" d="M57.553-21.375c-0.182,0.184-0.479,0.184-0.662,0l-0.33-0.33c-0.184-0.183-0.184-0.48,0-0.663
-				l7.049-7.046c0.184-0.183,0.482-0.183,0.662-0.002l0.332,0.332c0.182,0.183,0.182,0.479,0,0.662L57.553-21.375z"/>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M64.604-22.366c0.184,0.182,0.184,0.48,0,0.663l-0.332,0.33c-0.184,0.182-0.48,0.182-0.662,0
-				l-7.049-7.049c-0.184-0.183-0.184-0.481,0-0.662l0.332-0.332c0.182-0.181,0.479-0.181,0.66,0L64.604-22.366z"/>
-		</g>
-	</g>
-	<g>
-		
-			<circle fill="none" stroke="#FFFFFF" stroke-width="0.75" stroke-linecap="round" stroke-miterlimit="10" cx="60.582" cy="-25.394" r="7.16"/>
-	</g>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/add_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/add_white_16px.svg
deleted file mode 100644
index d9abdc2ef..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/add_white_16px.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path fill="#FFFFFF" d="M2.342,2.343c-3.123,3.124-3.123,8.19,0,11.313c3.124,3.125,8.191,3.125,11.314,0
-	c3.125-3.123,3.125-8.189,0-11.313C10.533-0.781,5.466-0.781,2.342,2.343 M12,6.999c0.553,0,1,0.447,1,1
-	c0,0.276-0.111,0.526-0.293,0.707S12.275,8.998,12,8.998L8.998,8.999V12C9,12.275,8.889,12.525,8.707,12.705
-	c-0.182,0.182-0.432,0.293-0.708,0.293c-0.552,0-0.999-0.447-1-1V8.999H4c-0.553-0.001-1-0.448-1-1c0-0.552,0.447-1,1-1h2.999v-3
-	c0-0.553,0.447-1,1-1c0.554,0,1.001,0.447,1.001,1L8.998,7L12,6.999z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/advanced_search_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/advanced_search_black_16px.svg
deleted file mode 100644
index 61b37d626..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/advanced_search_black_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path d="M12.011,15.99c-0.401,0-0.803-0.17-1.084-0.502l-3.091-3.654c-0.506-0.6-0.431-1.492,0.166-1.999
-	C8.6,9.331,9.494,9.404,10,10.002l3.093,3.655c0.505,0.599,0.433,1.491-0.167,1.997C12.659,15.881,12.334,15.99,12.011,15.99"/>
-<path d="M10.25,4.546C10.25,4.796,10.023,5,9.75,5h-0.5c-0.273,0-0.5-0.204-0.5-0.454V0.455C8.75,0.205,8.977,0,9.25,0h0.5
-	c0.273,0,0.5,0.205,0.5,0.455V4.546z"/>
-<path d="M12,2.75c0,0.275-0.204,0.5-0.455,0.5h-4.09C7.205,3.25,7,3.025,7,2.75v-0.5c0-0.274,0.205-0.5,0.455-0.5h4.09
-	C11.796,1.75,12,1.976,12,2.25V2.75z"/>
-<path d="M5.207,10.748c-2.091,0-3.791-1.701-3.791-3.79c0-2.09,1.7-3.791,3.791-3.791c0,0,0.48,0.048,0.48-0.452s0-0.212,0-0.565
-	s-0.48-0.4-0.48-0.4C2.336,1.75,0,4.086,0,6.958c0,2.871,2.336,5.207,5.207,5.207c2.87,0,5.206-2.336,5.206-5.207
-	c0,0-0.007-0.427-0.463-0.427c-0.341,0-0.134,0-0.55,0S8.996,6.958,8.996,6.958C8.996,9.047,7.297,10.748,5.207,10.748z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/advanced_search_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/advanced_search_white_16px.svg
deleted file mode 100644
index c87a99c45..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/advanced_search_white_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M12.011,15.99c-0.402,0-0.803-0.17-1.084-0.502l-3.091-3.654c-0.506-0.599-0.431-1.492,0.166-1.999
-	c0.598-0.504,1.492-0.431,1.998,0.167l3.093,3.655c0.505,0.599,0.432,1.492-0.167,1.998C12.659,15.881,12.334,15.99,12.011,15.99"/>
-<path fill="#FFFFFF" d="M10.25,4.546C10.25,4.796,10.024,5,9.75,5h-0.5c-0.274,0-0.5-0.204-0.5-0.454V0.455
-	C8.75,0.205,8.976,0,9.25,0h0.5c0.274,0,0.5,0.205,0.5,0.455V4.546z"/>
-<path fill="#FFFFFF" d="M12,2.75c0,0.275-0.204,0.5-0.455,0.5h-4.09C7.205,3.25,7,3.025,7,2.75v-0.5c0-0.274,0.205-0.5,0.455-0.5
-	h4.09C11.796,1.75,12,1.976,12,2.25V2.75z"/>
-<path fill="#FFFFFF" d="M5.207,10.748c-2.091,0-3.791-1.701-3.791-3.79c0-2.09,1.7-3.791,3.791-3.791V1.75
-	C2.336,1.75,0,4.086,0,6.958c0,2.871,2.336,5.207,5.207,5.207c2.87,0,5.206-2.336,5.206-5.207H8.996
-	C8.996,9.047,7.297,10.748,5.207,10.748z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmCleared_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmCleared_16px.svg
deleted file mode 100644
index 547e78357..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmCleared_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 1157.97 16 16" enable-background="new 8 1157.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<circle fill="#89BA17" cx="16" cy="1165.97" r="7"/>
-<rect x="8" y="1157.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmCleared_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmCleared_white_16px.svg
deleted file mode 100644
index 1f8150c95..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmCleared_white_16px.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1 16 16" enable-background="new -1 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<circle fill="#FFFFFF" cx="7" cy="7" r="7"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmCritical_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmCritical_16px.svg
deleted file mode 100644
index d1286211f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmCritical_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 997.97 16 16" enable-background="new 8 997.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path fill="#E32219" d="M21.665,1011.206l-4.363-5.235l4.467-5.36c0.248-0.298,0.302-0.713,0.137-1.064
-	c-0.165-0.351-0.518-0.576-0.906-0.576H10c-0.552,0-1,0.448-1,1v12c0,0.552,0.448,1,1,1h11c0.007,0,0.013,0,0.02,0
-	c0.552,0,1-0.448,1-1C22.02,1011.663,21.882,1011.389,21.665,1011.206z"/>
-<rect x="8" y="997.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmCritical_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmCritical_white_16px.svg
deleted file mode 100644
index 2675874f9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmCritical_white_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1 16 16" enable-background="new -1 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M12.665,12.235L8.302,7l4.468-5.359c0.248-0.298,0.301-0.713,0.137-1.064C12.741,0.226,12.389,0,12,0H1
-	C0.448,0,0,0.448,0,1v12c0,0.553,0.448,1,1,1h11c0.007,0,0.014,0,0.02,0c0.553,0,1-0.447,1-1
-	C13.02,12.692,12.882,12.418,12.665,12.235z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmHeartbeat_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmHeartbeat_16px.svg
deleted file mode 100644
index a70726863..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmHeartbeat_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 805.97 16 16" enable-background="new 8 805.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<polyline fill="none" stroke="#E32219" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
-	18,807.97 13,813.97 19,813.97 14,819.97 "/>
-<rect x="8" y="805.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmIndeterminate_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmIndeterminate_16px.svg
deleted file mode 100644
index 08ddaed14..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmIndeterminate_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 1125.97 16 16" enable-background="new 8 1125.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path fill="#B1B3B4" d="M22,1126.97H10c-0.552,0-1,0.448-1,1v12c0,0.552,0.448,1,1,1h12c0.552,0,1-0.448,1-1v-12
-	C23,1127.418,22.552,1126.97,22,1126.97z"/>
-<rect x="8" y="1125.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmIndeterminate_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmIndeterminate_white_16px.svg
deleted file mode 100644
index 552dc2b55..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmIndeterminate_white_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1 16 16" enable-background="new -1 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<rect x="1" y="1" fill="#FFFFFF" width="12" height="12"/>
-<path fill="#FFFFFF" d="M13,14H1c-0.553,0-1-0.448-1-1V1c0-0.554,0.447-1,1-1h12c0.552,0,1,0.446,1,1v12C14,13.552,13.552,14,13,14
-	 M2,12h10V2H2V12z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmMajor_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmMajor_16px.svg
deleted file mode 100644
index 7dc4e5ba9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmMajor_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 1029.97 16 16" enable-background="new 8 1029.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path fill="#FF7300" d="M22.424,1031.065c-0.351-0.165-0.767-0.111-1.064,0.137l-5.36,4.466l-5.36-4.466
-	c-0.298-0.248-0.712-0.302-1.064-0.137C9.225,1031.229,9,1031.582,9,1031.97v12c0,0.552,0.448,1,1,1h12c0.552,0,1-0.448,1-1v-12
-	C23,1031.582,22.776,1031.229,22.424,1031.065z"/>
-<rect x="8" y="1029.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmMajor_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmMajor_white_16px.svg
deleted file mode 100644
index ebb172ca4..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmMajor_white_16px.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1 16 16" enable-background="new -1 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M13.424,0.094c-0.35-0.164-0.766-0.11-1.064,0.138L7,4.697L1.641,0.231C1.342-0.017,0.928-0.07,0.576,0.094
-	S0,0.611,0,0.999v12c0,0.552,0.449,1,1,1h12c0.553,0,1-0.448,1-1v-12C14,0.611,13.775,0.258,13.424,0.094z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmMinor_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmMinor_16px.svg
deleted file mode 100644
index 65731635a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmMinor_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 1061.97 16 16" enable-background="new 8 1061.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path fill="#FABB00" d="M22.857,1068.456l-3-5c-0.361-0.602-1.354-0.602-1.715,0L16,1067.027l-2.143-3.571
-	c-0.361-0.602-1.354-0.602-1.715,0l-3,5C9.049,1068.611,9,1068.789,9,1068.97v7c0,0.552,0.448,1,1,1h12c0.552,0,1-0.448,1-1v-7
-	C23,1068.789,22.951,1068.611,22.857,1068.456z"/>
-<rect x="8" y="1061.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmMinor_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmMinor_white_16px.svg
deleted file mode 100644
index 94516df66..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmMinor_white_16px.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1 16 16" enable-background="new -1 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M13.857,5.452l-3-5c-0.361-0.603-1.355-0.603-1.715,0L7,4.023L4.857,0.452c-0.361-0.603-1.355-0.603-1.715,0
-	l-3,5C0.049,5.607,0,5.785,0,5.966v7c0,0.551,0.447,1,1,1h12c0.551,0,1-0.449,1-1v-7C14,5.785,13.951,5.607,13.857,5.452z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmOtherGrouping_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmOtherGrouping_16px.svg
deleted file mode 100644
index a2644319f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmOtherGrouping_16px.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path fill="#231F20" d="M20.307,1.308c-3.123,3.124-3.123,8.19,0,11.313c3.124,3.125,8.191,3.125,11.314,0
-	c3.125-3.123,3.125-8.189,0-11.313C28.498-1.816,23.431-1.816,20.307,1.308 M29.965,5.964c0.553,0,1,0.447,1,1
-	c0,0.276-0.111,0.526-0.293,0.707s-0.432,0.292-0.707,0.292l-3.002,0.001v3c0.002,0.275-0.109,0.525-0.291,0.705
-	c-0.182,0.182-0.432,0.293-0.708,0.293c-0.552,0-0.999-0.447-1-1V7.964h-2.999c-0.553-0.001-1-0.448-1-1c0-0.552,0.447-1,1-1h2.999
-	v-3c0-0.553,0.447-1,1-1c0.554,0,1.001,0.447,1.001,1l-0.002,3.001L29.965,5.964z"/>
-<path fill="#B1B3B4" d="M35.438,17.073H21.724c-0.632,0-1.143,0.516-1.143,0.878v7.625c0,0.029,0.023,0.057,0.029,0.084
-	c0.303,4.143,3.75,7.413,7.971,7.413s7.668-3.271,7.971-7.413c0.006-0.029,0.029-0.055,0.029-0.086v-7.646
-	C36.581,17.564,36.067,17.073,35.438,17.073z"/>
-<g>
-	<g>
-		<ellipse fill="#B1B3B4" cx="3.706" cy="8.536" rx="3.705" ry="3.87"/>
-	</g>
-	<rect x="9.604" y="0.508" fill="#B1B3B4" width="5.845" height="6.104"/>
-	<path fill="#B1B3B4" d="M15.448,7.119H9.604c-0.269,0-0.485-0.227-0.485-0.51V0.508C9.118,0.227,9.335,0,9.604,0h5.845
-		c0.271,0,0.488,0.227,0.488,0.508v6.104C15.937,6.893,15.719,7.119,15.448,7.119z M10.092,6.102h4.87V1.017h-4.87V6.102z"/>
-	<path fill="#B1B3B4" d="M15.508,8.813H9.608c-0.271,0-0.49,0.231-0.49,0.393v3.426c0,0.013,0.009,0.025,0.012,0.038
-		C9.261,14.531,10.743,16,12.56,16c1.814,0,3.298-1.469,3.428-3.331C15.989,12.654,16,12.644,16,12.631V9.195
-		C16,9.031,15.778,8.813,15.508,8.813z"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmUnacknowledged.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmUnacknowledged.svg
deleted file mode 100644
index 7e6c50790..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmUnacknowledged.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M12,7c0-1.709-0.984-2.682-2.305-2.93C9.342,2.229,8.717,1,8,1S6.656,2.229,6.303,4.07
-			C4.984,4.318,4,5.291,4,7c0,3-2,3.76-2,4.5C2,12.881,4.686,14,8,14c3.313,0,6-1.119,6-2.5C14,10.76,12,10,12,7z"/>
-		<path fill="#1D1D1B" d="M8,15.25C8,15.664,7.664,16,7.25,16h-1.5C5.336,16,5,15.664,5,15.25l0,0c0-0.414,0.336-0.75,0.75-0.75h1.5
-			C7.664,14.5,8,14.836,8,15.25L8,15.25z"/>
-	</g>
-	<path fill="none" stroke="#8E8E8D" stroke-miterlimit="10" d="M12,2c3,0,3.5,1.687,3.5,5"/>
-	<path fill="none" stroke="#8E8E8D" stroke-miterlimit="10" d="M12,3.5c1.104,0,2,1.09,2,3.5"/>
-	<path fill="none" stroke="#8E8E8D" stroke-miterlimit="10" d="M4,2C1,2,0.5,3.687,0.5,7"/>
-	<path fill="none" stroke="#8E8E8D" stroke-miterlimit="10" d="M4,3.5C2.895,3.5,2,4.59,2,7"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmUnacknowledged_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmUnacknowledged_white.svg
deleted file mode 100644
index 7a599913c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmUnacknowledged_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 15"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_alarmUnacknowledged_white</title><path class="cls-1" d="M12,6.5A2.74,2.74,0,0,0,9.69,3.57C9.34,1.73,8.72.5,8,.5S6.66,1.73,6.3,3.57A2.74,2.74,0,0,0,4,6.5c0,3-2,3.76-2,4.5,0,1.38,2.69,2.5,6,2.5s6-1.12,6-2.5C14,10.26,12,9.5,12,6.5Z" transform="translate(0 -0.5)"/><path class="cls-1" d="M8,14.75a.75.75,0,0,1-.75.75H5.75A.75.75,0,0,1,5,14.75H5A.75.75,0,0,1,5.75,14h1.5a.75.75,0,0,1,.75.75Z" transform="translate(0 -0.5)"/><path class="cls-1" d="M16,6.5H15C15,3,14.35,2,12,2V1C15.69,1,16,3.6,16,6.5Z" transform="translate(0 -0.5)"/><path class="cls-1" d="M14.5,6.5h-1c0-1.85-.57-3-1.5-3v-1C13.21,2.5,14.5,3.55,14.5,6.5Z" transform="translate(0 -0.5)"/><path class="cls-1" d="M1,6.5H0C0,3.6.31,1,4,1V2C1.65,2,1,3,1,6.5Z" transform="translate(0 -0.5)"/><path class="cls-1" d="M2.5,6.5h-1c0-2.95,1.29-4,2.5-4v1C3.07,3.5,2.5,4.65,2.5,6.5Z" transform="translate(0 -0.5)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmUnspecified_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmUnspecified_16px.svg
deleted file mode 100644
index 67d098b81..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmUnspecified_16px.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path fill="#231F20" d="M20.307,1.308c-3.123,3.124-3.123,8.19,0,11.313c3.124,3.125,8.191,3.125,11.314,0
-	c3.125-3.123,3.125-8.189,0-11.313C28.498-1.816,23.431-1.816,20.307,1.308 M29.965,5.964c0.553,0,1,0.447,1,1
-	c0,0.276-0.111,0.526-0.293,0.707s-0.432,0.292-0.707,0.292l-3.002,0.001v3c0.002,0.275-0.109,0.525-0.291,0.705
-	c-0.182,0.182-0.432,0.293-0.708,0.293c-0.552,0-0.999-0.447-1-1V7.964h-2.999c-0.553-0.001-1-0.448-1-1c0-0.552,0.447-1,1-1h2.999
-	v-3c0-0.553,0.447-1,1-1c0.554,0,1.001,0.447,1.001,1l-0.002,3.001L29.965,5.964z"/>
-<path fill="#B1B3B4" d="M14.857,0H1.143C0.511,0,0,0.516,0,0.878v7.625c0,0.029,0.023,0.056,0.03,0.084C0.332,12.729,3.78,16,8,16
-	c4.221,0,7.668-3.271,7.971-7.413C15.977,8.558,16,8.532,16,8.501V0.854C16,0.492,15.486,0,14.857,0z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmWarning_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmWarning_16px.svg
deleted file mode 100644
index 7011c22ef..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmWarning_16px.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<rect x="8" y="1093.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<path fill="#2379FF" d="M14,1H2C1.448,1,1,1.448,1,2v7c0,0.182,0.049,0.359,0.143,0.516l3,5c0.361,0.602,1.354,0.602,1.715,0
-	l2.144-3.571l2.144,3.571C10.325,14.816,10.65,15,11.001,15s0.677-0.184,0.856-0.484l3-5C14.951,9.36,15.001,9.183,15.001,9V2
-	C15,1.448,14.552,1,14,1z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alarmWarning_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alarmWarning_white_16px.svg
deleted file mode 100644
index 0824e4532..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alarmWarning_white_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1 16 16" enable-background="new -1 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M13,0H1C0.448,0,0,0.448,0,1v7c0,0.182,0.049,0.359,0.143,0.516l3,5c0.361,0.603,1.354,0.603,1.715,0
-	l2.145-3.57l2.145,3.57C9.325,13.816,9.65,14,10.001,14s0.677-0.184,0.856-0.484l3-5C13.951,8.359,14.001,8.184,14.001,8V1
-	C14,0.448,13.552,0,13,0z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alignCenter_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alignCenter_black_16px.svg
deleted file mode 100644
index ab11fa502..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alignCenter_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2149.971 16 16" enable-background="new 13 2149.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="15" y1="2151.471" x2="27" y2="2151.471"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="16.5" y1="2154.471" x2="25.5" y2="2154.471"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="15" y1="2157.471" x2="27" y2="2157.471"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="16.5" y1="2160.471" x2="25.5" y2="2160.471"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="15" y1="2163.471" x2="27" y2="2163.471"/>
-<rect x="13" y="2149.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alignCenter_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alignCenter_white.svg
deleted file mode 100644
index 505af8dba..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alignCenter_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13 13"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_alignCenter_white</title><path class="cls-1" d="M14,2.5H2a.5.5,0,0,1,0-1H14a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/><path class="cls-1" d="M12.5,5.5h-9a.5.5,0,0,1,0-1h9a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/><path class="cls-1" d="M14,8.5H2a.5.5,0,0,1,0-1H14a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/><path class="cls-1" d="M12.5,11.5h-9a.5.5,0,0,1,0-1h9a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/><path class="cls-1" d="M14,14.5H2a.5.5,0,0,1,0-1H14a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alignLeft_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alignLeft_black_16px.svg
deleted file mode 100644
index 6de8008ed..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alignLeft_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2117.971 16 16" enable-background="new 13 2117.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="15" y1="2119.471" x2="27" y2="2119.471"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="15" y1="2122.471" x2="24" y2="2122.471"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="15" y1="2125.471" x2="27" y2="2125.471"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="15" y1="2128.471" x2="24" y2="2128.471"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="15" y1="2131.471" x2="27" y2="2131.471"/>
-<rect x="13" y="2117.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alignLeft_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alignLeft_white.svg
deleted file mode 100644
index 727c73f51..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alignLeft_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13 13"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_alignLeft-white</title><path class="cls-1" d="M14,2.5H2a.5.5,0,0,1,0-1H14a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/><path class="cls-1" d="M11,5.5H2a.5.5,0,0,1,0-1h9a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/><path class="cls-1" d="M14,8.5H2a.5.5,0,0,1,0-1H14a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/><path class="cls-1" d="M11,11.5H2a.5.5,0,0,1,0-1h9a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/><path class="cls-1" d="M14,14.5H2a.5.5,0,0,1,0-1H14a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alignRight_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alignRight_black_16px.svg
deleted file mode 100644
index 166361668..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alignRight_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2181.971 16 16" enable-background="new 13 2181.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="15" y1="2183.471" x2="27" y2="2183.471"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="18" y1="2186.471" x2="27" y2="2186.471"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="15" y1="2189.471" x2="27" y2="2189.471"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="18" y1="2192.471" x2="27" y2="2192.471"/>
-<line fill="none" stroke="#000000" stroke-linecap="round" stroke-miterlimit="10" x1="15" y1="2195.471" x2="27" y2="2195.471"/>
-<rect x="13" y="2181.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/alignRight_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/alignRight_white.svg
deleted file mode 100644
index ac40011bc..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/alignRight_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13 13"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_alignRight_white</title><path class="cls-1" d="M14,2.5H2a.5.5,0,0,1,0-1H14a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/><path class="cls-1" d="M14,5.5H5a.5.5,0,0,1,0-1h9a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/><path class="cls-1" d="M14,8.5H2a.5.5,0,0,1,0-1H14a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/><path class="cls-1" d="M14,11.5H5a.5.5,0,0,1,0-1h9a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/><path class="cls-1" d="M14,14.5H2a.5.5,0,0,1,0-1H14a.5.5,0,0,1,0,1" transform="translate(-1.5 -1.5)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/arrowUpSmall_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/arrowUpSmall_white_16px.svg
deleted file mode 100644
index 035fbf8c5..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/arrowUpSmall_white_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-4 -5.5 16 16" enable-background="new -4 -5.5 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M7.707,4.708C7.512,4.901,7.256,5.001,7,5.001s-0.512-0.1-0.707-0.293L4,2.415L1.707,4.708
-	c-0.391,0.391-1.023,0.391-1.414,0c-0.391-0.393-0.391-1.023,0-1.414l3-3c0.391-0.392,1.023-0.392,1.414,0l3,3
-	C8.098,3.685,8.098,4.315,7.707,4.708"/>
-</svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/attach_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/attach_black_16px.svg
deleted file mode 100644
index 8e54d4740..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/attach_black_16px.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<rect x="8" y="389.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<path d="M9,0.5c-1.654,0-3,1.346-3,3V4v2v4c0,1.425,0.645,2.5,1.5,2.5h1H9c0.579,0,1-0.631,1-1.5V4H9v7
-	c0,0.249-0.061,0.422-0.103,0.5H8.5h-1C7.401,11.5,7,11.018,7,10V6V4V3.5c0-1.103,0.897-2,2-2s2,0.897,2,2V8v2v1.5
-	c0,1.654-1.346,3-3,3c-1.626,0-3-2.061-3-4.5V4H4v6c0,3.032,1.794,5.5,4,5.5s4-1.794,4-4V10V8V3.5C12,1.846,10.654,0.5,9,0.5z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/attach_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/attach_white.svg
deleted file mode 100644
index ec1ecd071..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/attach_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 15"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_attach_white</title><path class="cls-1" d="M9,.5a3,3,0,0,0-3,3V10c0,1.42.64,2.5,1.5,2.5H9c.58,0,1-.63,1-1.5V4H9v7a1.09,1.09,0,0,1-.1.5H7.5C7.4,11.5,7,11,7,10V3.5a2,2,0,0,1,4,0v8a3,3,0,0,1-3,3c-1.63,0-3-2.06-3-4.5V4H4v6c0,3,1.79,5.5,4,5.5a4,4,0,0,0,4-4v-8A3,3,0,0,0,9,.5Z" transform="translate(-4 -0.5)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/baseStation.svg b/client/client-editor/src/main/resources/webapp/resources/16px/baseStation.svg
deleted file mode 100644
index 0cd1668e5..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/baseStation.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" overflow="visible" enable-background="new 0 0 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path d="M9.75,3.701c0-0.97-0.783-1.756-1.75-1.756c-0.969,0-1.75,0.786-1.75,1.756S7.031,5.458,8,5.458
-	C8.967,5.458,9.75,4.671,9.75,3.701"/>
-<path d="M12,16c-0.229,0-0.443-0.138-0.529-0.365L8,6.545l-3.471,9.089c-0.112,0.293-0.442,0.441-0.732,0.327
-	c-0.292-0.111-0.439-0.441-0.326-0.733l4-10.477c0.168-0.441,0.891-0.441,1.059,0l4,10.477c0.112,0.292-0.034,0.622-0.326,0.733
-	C12.136,15.988,12.066,16,12,16"/>
-<path d="M10.112,11.859H5.938c-0.313,0-0.567-0.255-0.567-0.568s0.254-0.568,0.567-0.568h4.175c0.313,0,0.567,0.255,0.567,0.568
-	S10.426,11.859,10.112,11.859"/>
-<path d="M12.031,16c-0.08,0-0.16-0.016-0.236-0.052c-0.663-0.306-1.204-0.57-1.657-0.79c-2.083-1.014-2.083-1.014-4.271,0.036
-	c-0.443,0.213-0.968,0.464-1.601,0.754c-0.286,0.131-0.621,0.006-0.751-0.28c-0.131-0.286-0.005-0.623,0.28-0.754
-	c0.626-0.289,1.144-0.537,1.582-0.747c2.58-1.238,2.775-1.241,5.255-0.033c0.447,0.219,0.98,0.479,1.635,0.78
-	c0.285,0.131,0.409,0.469,0.279,0.754C12.451,15.876,12.246,16,12.031,16"/>
-<path d="M3.971,6.165c-0.158,0-0.311-0.09-0.384-0.243C3.322,5.366,3.188,4.769,3.188,4.152c0-0.952,0.331-1.878,0.933-2.611
-	C4.271,1.36,4.54,1.335,4.72,1.484c0.182,0.149,0.207,0.419,0.058,0.601c-0.477,0.58-0.74,1.313-0.74,2.068
-	c0,0.489,0.107,0.96,0.317,1.402c0.102,0.212,0.013,0.466-0.2,0.568C4.095,6.15,4.032,6.165,3.971,6.165"/>
-<path d="M1.042,7.628c-0.158,0-0.312-0.089-0.384-0.244C0.222,6.466,0,5.484,0,4.464c0-1.57,0.547-3.101,1.54-4.31
-	c0.149-0.181,0.419-0.206,0.599-0.057c0.182,0.15,0.207,0.418,0.058,0.6C1.328,1.753,0.85,3.092,0.85,4.464
-	c0,0.892,0.194,1.75,0.576,2.554c0.102,0.212,0.012,0.467-0.2,0.568C1.166,7.615,1.104,7.628,1.042,7.628"/>
-<path d="M12.029,6.165c0.158,0,0.311-0.09,0.384-0.243c0.265-0.556,0.398-1.153,0.398-1.769c0-0.952-0.331-1.878-0.933-2.611
-	c-0.15-0.182-0.419-0.207-0.599-0.058c-0.182,0.149-0.207,0.419-0.058,0.601c0.477,0.58,0.739,1.313,0.739,2.068
-	c0,0.489-0.106,0.96-0.316,1.402c-0.102,0.212-0.013,0.466,0.2,0.568C11.905,6.15,11.967,6.165,12.029,6.165"/>
-<path d="M14.958,7.628c0.158,0,0.311-0.089,0.384-0.244C15.778,6.466,16,5.484,16,4.464c0-1.57-0.547-3.101-1.54-4.31
-	c-0.15-0.181-0.419-0.206-0.599-0.057c-0.182,0.15-0.207,0.418-0.058,0.6c0.868,1.056,1.347,2.395,1.347,3.767
-	c0,0.892-0.194,1.75-0.576,2.554c-0.102,0.212-0.013,0.467,0.199,0.568C14.834,7.615,14.896,7.628,14.958,7.628"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/cabinet_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/cabinet_black_16px.svg
deleted file mode 100644
index c6521499e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/cabinet_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 485.97 16 16" enable-background="new 8 485.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M20,499.97v-12h1c0.552,0,1,0.447,1,1v10c0,0.553-0.448,1-1,1 M10,499.97
-	c-0.553,0-1-0.447-1-1v-10c0-0.553,0.447-1,1-1h1v12H10z M16,499.97v-12h3v12H16z M12,499.97v-12h3v12H12z M13.5,492.97
-	c0.552,0,1,0.447,1,1c0,0.553-0.448,1-1,1c-0.553,0-1-0.447-1-1C12.5,493.418,12.947,492.97,13.5,492.97z M17.499,492.97
-	c0.554,0,1.001,0.447,1.001,1c0,0.553-0.448,1-1.001,1c-0.553,0-0.999-0.447-0.999-1C16.5,493.418,16.945,492.97,17.499,492.97z"/>
-<rect x="8" y="485.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/calendar_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/calendar_black_16px.svg
deleted file mode 100644
index 622b28dc7..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/calendar_black_16px.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="13" y="2885.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<path d="M13,1.971v2c0,0.551-0.45,1-1,1h-1c-0.55,0-1-0.449-1-1v-2H6V3.97c0,0.55-0.45,1-1,1H4c-0.55,0-1-0.45-1-1V1.971
-	c-1.1,0-2,0.9-2,2v10.03C1,15.103,1.9,16,3,16h10c1.1,0,2-0.897,2-1.999V3.971C15,2.871,14.1,1.971,13,1.971z M13,13.001
-	c0,0.553-0.448,1-1,1H4c-0.551,0-1-0.447-1-1V7.97h10V13.001z"/>
-<rect x="4" y="0.971" width="1" height="3"/>
-<rect x="11" y="0.971" width="1" height="3"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/calendar_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/calendar_white_16px.svg
deleted file mode 100644
index 39c2cdd50..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/calendar_white_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-0.5 -1 16 16" enable-background="new -0.5 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M13,0.999v2c0,0.551-0.45,1-1,1h-1c-0.55,0-1-0.449-1-1v-2H5v2c0,0.551-0.45,1-1,1H3c-0.55,0-1-0.449-1-1v-2
-	c-1.1,0-2,0.9-2,2v9c0,1.101,0.9,2,2,2h11c1.1,0,2-0.899,2-2v-9C15,1.899,14.1,0.999,13,0.999 M14,11.999c0,0.553-0.448,1-1,1H2
-	c-0.551,0-1-0.447-1-1v-6h13V11.999z"/>
-<rect x="3" fill="#FFFFFF" width="1" height="3"/>
-<rect x="11" fill="#FFFFFF" width="1" height="3"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/cellAdjacent_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/cellAdjacent_16px.svg
deleted file mode 100644
index 2641e39ec..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/cellAdjacent_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 933.97 16 16" enable-background="new 8 933.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<g>
-	<polygon fill="#808080" points="11.042,943.97 9,939.97 11.042,935.97 15.125,935.97 17.167,939.97 15.125,943.97 	"/>
-</g>
-<g>
-	<polygon fill="#808080" points="18,949.97 16,945.97 18,941.97 22,941.97 24,945.97 22,949.97 	"/>
-</g>
-<rect x="8" y="933.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/cellExternal_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/cellExternal_16px.svg
deleted file mode 100644
index 02f8b82c4..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/cellExternal_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 965.97 16 16" enable-background="new 8 965.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<g>
-	<polygon fill="#0066B3" points="11.042,975.97 9,971.97 11.042,967.97 15.125,967.97 17.167,971.97 15.125,975.97 	"/>
-</g>
-<g>
-	<polygon fill="#808080" points="18,981.97 16,977.97 18,973.97 22,973.97 24,977.97 22,981.97 	"/>
-</g>
-<rect x="8" y="965.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/cell_gray_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/cell_gray_16px.svg
deleted file mode 100644
index 97f33eea6..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/cell_gray_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 837.97 16 16" enable-background="new 8 837.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<polygon fill="#808080" points="12.5,852.97 9,846.47 12.5,839.97 19.5,839.97 23,846.47 19.5,852.97 "/>
-<rect x="8" y="837.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/cell_green_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/cell_green_16px.svg
deleted file mode 100644
index a61b7bee4..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/cell_green_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 869.97 16 16" enable-background="new 8 869.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<polygon fill="#89BA17" points="12.5,884.97 9,878.47 12.5,871.97 19.5,871.97 23,878.47 19.5,884.97 "/>
-<rect x="8" y="869.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/cell_red_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/cell_red_16px.svg
deleted file mode 100644
index 5e4fd393b..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/cell_red_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 901.97 16 16" enable-background="new 8 901.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<polygon fill="#E32219" points="12.5,916.97 9,910.47 12.5,903.97 19.5,903.97 23,910.47 19.5,916.97 "/>
-<rect x="8" y="901.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/charging_black.svg b/client/client-editor/src/main/resources/webapp/resources/16px/charging_black.svg
deleted file mode 100644
index fc4b204c2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/charging_black.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 1189.97 16 16" enable-background="new 8 1189.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path d="M15.998,1203.363c-1.272,0-2.257-0.293-2.926-0.871c-0.624-0.537-1.019-1.32-1.176-2.33l1.648-0.16
-	c0.145,0.645,0.41,1.135,0.791,1.461c0.421,0.359,0.986,0.541,1.684,0.541c0.736,0,1.304-0.164,1.689-0.486
-	c0.399-0.332,0.601-0.73,0.601-1.184c0-0.301-0.092-0.563-0.271-0.777c-0.174-0.207-0.455-0.379-0.86-0.523
-	c-0.257-0.089-0.82-0.241-1.725-0.466c-1.1-0.272-1.877-0.606-2.308-0.993c-0.604-0.542-0.897-1.183-0.897-1.958
-	c0-0.49,0.142-0.957,0.421-1.388c0.279-0.428,0.689-0.76,1.218-0.985c0.543-0.232,1.212-0.349,1.989-0.349
-	c1.262,0,2.219,0.274,2.843,0.816c0.576,0.499,0.893,1.138,0.966,1.948l-1.719,0.075c-0.114-0.498-0.324-0.872-0.628-1.112
-	c-0.338-0.268-0.838-0.404-1.484-0.404c-0.662,0-1.194,0.143-1.58,0.423c-0.28,0.203-0.429,0.49-0.429,0.832
-	c0,0.317,0.133,0.588,0.395,0.808c0.298,0.249,0.966,0.494,2.047,0.75c1.012,0.239,1.768,0.487,2.245,0.738
-	c0.458,0.242,0.822,0.576,1.08,0.993c0.258,0.418,0.388,0.943,0.388,1.565c0,0.557-0.158,1.088-0.47,1.578
-	c-0.31,0.488-0.754,0.855-1.323,1.092C17.623,1203.24,16.88,1203.363,15.998,1203.363z"/>
-<line fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="16" y1="1191.97" x2="16" y2="1203.97"/>
-<rect x="8" y="1189.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/charging_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/charging_white.svg
deleted file mode 100644
index 97905902d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/charging_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 14"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_dollar_white</title><path class="cls-1" d="M8,13.4a4.29,4.29,0,0,1-2.89-.87A3.72,3.72,0,0,1,4,10.2L5.63,10a2.62,2.62,0,0,0,.78,1.46A2.46,2.46,0,0,0,8.07,12a2.53,2.53,0,0,0,1.67-.49,1.51,1.51,0,0,0,.59-1.18,1.19,1.19,0,0,0-.27-.78,1.91,1.91,0,0,0-.85-.52C9,9,8.41,8.84,7.51,8.61a5.51,5.51,0,0,1-2.28-1,2.57,2.57,0,0,1-.47-3.34A2.63,2.63,0,0,1,6,3.3a5,5,0,0,1,2-.35,4.18,4.18,0,0,1,2.81.82,2.79,2.79,0,0,1,1,1.94L10,5.79a1.91,1.91,0,0,0-.62-1.11,2.31,2.31,0,0,0-1.47-.4,2.6,2.6,0,0,0-1.56.42,1,1,0,0,0-.42.83,1,1,0,0,0,.39.81,5.6,5.6,0,0,0,2,.75,10,10,0,0,1,2.22.74,2.74,2.74,0,0,1,1.07,1A3,3,0,0,1,12,10.37a2.92,2.92,0,0,1-.46,1.57A2.77,2.77,0,0,1,10.23,13,5.66,5.66,0,0,1,8,13.4" transform="translate(-4 -1)"/><path class="cls-1" d="M8,15a1,1,0,0,1-1-1V2A1,1,0,1,1,9,2V14a1,1,0,0,1-1,1" transform="translate(-4 -1)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowDown_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowDown_black_16px.svg
deleted file mode 100644
index 2e691316b..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowDown_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2085.971 16 16" enable-background="new 13 2085.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M28,2093.97c0-3.865-3.134-7-7-7c-3.866,0-7,3.135-7,7c0,3.867,3.134,7,7,7C24.866,2100.97,28,2097.836,28,2093.97z"/>
-<path fill="#FFFFFF" d="M20.294,2097.677l-3.001-3.001c-0.195-0.195-0.293-0.451-0.293-0.707s0.098-0.512,0.293-0.707
-	c0.391-0.391,1.023-0.391,1.414,0l1.294,1.294v-3.647c0-0.553,0.447-1,1-1c0.552,0,1,0.447,1,1v3.646l1.292-1.293
-	c0.391-0.391,1.023-0.391,1.414-0.001c0.391,0.391,0.391,1.024,0.001,1.415l-3,3.001c-0.188,0.188-0.442,0.293-0.707,0.293
-	C20.735,2097.97,20.481,2097.865,20.294,2097.677z"/>
-<rect x="13" y="2085.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowDown_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowDown_white_16px.svg
deleted file mode 100644
index c715ef456..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowDown_white_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-0.5 -0.5 16 16" enable-background="new -0.5 -0.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M0,7.5C0,11.644,3.358,15,7.5,15c4.144,0,7.5-3.357,7.5-7.5c0-4.142-3.356-7.499-7.5-7.5
-	C3.358,0.001,0,3.359,0,7.5 M8.207,11.238c-0.188,0.188-0.441,0.293-0.707,0.293c-0.266,0.001-0.521-0.105-0.709-0.293L3.793,8.236
-	c-0.392-0.39-0.392-1.021,0.001-1.413c0.391-0.39,1.021-0.391,1.413,0.001L6.5,8.117V4.471c0-0.553,0.447-1,1-1s1,0.447,1,1
-	L8.498,8.117l1.296-1.293c0.391-0.392,1.022-0.391,1.413,0C11.402,7.018,11.5,7.275,11.5,7.531s-0.098,0.511-0.293,0.705
-	L8.207,11.238"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowLeft_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowLeft_black_16px.svg
deleted file mode 100644
index 278f2adcd..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowLeft_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2021.971 16 16" enable-background="new 13 2021.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M21,2036.676c3.865,0,7-3.134,7-7c0-3.866-3.135-7-7-7c-3.867,0-7,3.134-7,7C14,2033.542,17.134,2036.676,21,2036.676z"/>
-<path fill="#FFFFFF" d="M17.293,2028.97l3.001-3.001c0.195-0.195,0.451-0.293,0.707-0.293s0.512,0.098,0.707,0.293
-	c0.391,0.391,0.391,1.023,0,1.414l-1.294,1.294h3.647c0.553,0,1,0.447,1,1c0,0.552-0.447,1-1,1h-3.646l1.293,1.292
-	c0.391,0.391,0.391,1.023,0.001,1.414c-0.391,0.391-1.024,0.391-1.415,0.001l-3.001-3c-0.188-0.188-0.293-0.442-0.293-0.707
-	C17,2029.412,17.105,2029.158,17.293,2028.97z"/>
-<rect x="13" y="2021.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowLeft_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowLeft_white_16px.svg
deleted file mode 100644
index 7a356a52d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowLeft_white_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-0.5 -0.5 16 16" enable-background="new -0.5 -0.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M7.5,15c4.141,0,7.499-3.358,7.5-7.5C14.999,3.356,11.642,0,7.5,0C3.357,0,0,3.356,0,7.5
-	C0,11.642,3.356,15,7.5,15 M3.762,6.793l3.002-3C6.958,3.598,7.213,3.5,7.469,3.5s0.514,0.098,0.707,0.293
-	c0.391,0.391,0.392,1.022,0,1.413L6.883,6.502L10.529,6.5c0.553,0,1,0.447,1,1s-0.447,1-1,1H6.883l1.293,1.293
-	c0.392,0.392,0.391,1.022,0.001,1.413c-0.392,0.393-1.023,0.393-1.413,0.001L3.762,8.209C3.574,8.021,3.468,7.766,3.469,7.5
-	C3.469,7.234,3.574,6.981,3.762,6.793"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowRight_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowRight_black_16px.svg
deleted file mode 100644
index 593da8dd0..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowRight_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2053.971 16 16" enable-background="new 13 2053.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M21,2054.97c-3.865,0-7,3.134-7,7c0,3.866,3.135,7,7,7c3.867,0,7-3.134,7-7C28,2058.104,24.866,2054.97,21,2054.97z"/>
-<path fill="#FFFFFF" d="M24.707,2062.676l-3.001,3.001c-0.195,0.195-0.451,0.293-0.707,0.293s-0.512-0.098-0.707-0.293
-	c-0.391-0.391-0.391-1.023,0-1.414l1.294-1.294h-3.647c-0.553,0-1-0.447-1-1c0-0.552,0.447-1,1-1h3.646l-1.293-1.292
-	c-0.391-0.391-0.391-1.023-0.001-1.414c0.391-0.391,1.024-0.391,1.415-0.001l3.001,3c0.188,0.188,0.293,0.442,0.293,0.707
-	C25,2062.235,24.895,2062.489,24.707,2062.676z"/>
-<rect x="13" y="2053.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowRight_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowRight_white_16px.svg
deleted file mode 100644
index 635c7d4fb..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowRight_white_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-0.5 -0.5 16 16" enable-background="new -0.5 -0.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M7.5,15c4.144,0,7.5-3.358,7.5-7.5C15,3.356,11.643,0,7.5,0C3.358,0,0.001,3.356,0,7.5
-	C0.001,11.642,3.359,15,7.5,15 M11.238,6.793c0.188,0.188,0.293,0.441,0.293,0.707c0.001,0.266-0.105,0.521-0.293,0.709
-	l-3.002,2.998c-0.39,0.392-1.021,0.392-1.413-0.001c-0.39-0.391-0.391-1.021,0.001-1.413L8.117,8.5H4.471c-0.553,0-1-0.447-1-1
-	s0.447-1,1-1l3.646,0.002L6.824,5.206c-0.392-0.391-0.391-1.022,0-1.413C7.018,3.598,7.275,3.5,7.531,3.5s0.511,0.098,0.705,0.293
-	L11.238,6.793"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowUp_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowUp_black_16px.svg
deleted file mode 100644
index 03d366aba..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowUp_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1989.971 16 16" enable-background="new 13 1989.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M14,1997.971c0,3.865,3.134,7,7,7c3.866,0,7-3.135,7-7c0-3.866-3.134-7-7-7C17.134,1990.971,14,1994.105,14,1997.971z"/>
-<path fill="#FFFFFF" d="M21.706,1994.264l3.001,3.001c0.195,0.195,0.293,0.451,0.293,0.707s-0.098,0.512-0.293,0.707
-	c-0.391,0.391-1.023,0.391-1.414,0l-1.294-1.294v3.647c0,0.553-0.447,1-1,1c-0.552,0-1-0.447-1-1v-3.646l-1.292,1.293
-	c-0.391,0.391-1.023,0.391-1.414,0.001c-0.391-0.391-0.391-1.024-0.001-1.415l3-3.001c0.188-0.188,0.442-0.293,0.707-0.293
-	C21.265,1993.971,21.519,1994.077,21.706,1994.264z"/>
-<rect x="13" y="1989.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowUp_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowUp_white_16px.svg
deleted file mode 100644
index 9b44c4930..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleArrowUp_white_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-0.5 -0.5 16 16" enable-background="new -0.5 -0.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M15,7.5C15,3.356,11.642,0,7.5,0C3.356,0,0,3.357,0,7.5c0,4.142,3.356,7.499,7.5,7.5
-	C11.642,14.999,15,11.641,15,7.5 M6.793,3.762C6.981,3.574,7.234,3.469,7.5,3.469c0.266-0.001,0.521,0.105,0.709,0.293l2.998,3.002
-	c0.392,0.39,0.392,1.021-0.001,1.413c-0.391,0.39-1.021,0.391-1.413-0.001L8.5,6.883v3.646c0,0.553-0.447,1-1,1s-1-0.447-1-1
-	l0.002-3.646L5.206,8.176c-0.391,0.392-1.022,0.391-1.413,0C3.598,7.982,3.5,7.725,3.5,7.469s0.098-0.511,0.293-0.705L6.793,3.762"
-	/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretDown_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretDown_black_16px.svg
deleted file mode 100644
index edee7b083..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretDown_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1957.971 16 16" enable-background="new 13 1957.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M21,1972.97c3.866,0,7-3.134,7-7c0-3.865-3.134-7-7-7c-3.866,0-7,3.135-7,7C14,1969.837,17.134,1972.97,21,1972.97z"/>
-<path fill="#FFFFFF" d="M17.293,1964.263c0.195-0.195,0.451-0.293,0.707-0.293s0.512,0.098,0.707,0.293l2.293,2.293l2.293-2.293
-	c0.391-0.391,1.023-0.391,1.414,0s0.391,1.023,0,1.414l-3,3c-0.391,0.391-1.023,0.391-1.414,0l-3-3
-	C16.902,1965.287,16.902,1964.654,17.293,1964.263z"/>
-<rect x="13" y="1957.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretDown_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretDown_white_16px.svg
deleted file mode 100644
index adb699e61..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretDown_white_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-0.5 -0.5 16 16" enable-background="new -0.5 -0.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M7.5,15c4.142,0,7.5-3.356,7.5-7.5C15,3.358,11.642,0,7.5,0C3.357,0,0,3.358,0,7.5C0,11.643,3.357,15,7.5,15
-	 M3.793,5.793C3.988,5.599,4.244,5.5,4.5,5.5s0.512,0.099,0.707,0.293L7.5,8.086l2.292-2.293c0.391-0.392,1.023-0.392,1.414,0
-	s0.391,1.023,0,1.414l-3,3c-0.391,0.392-1.023,0.392-1.414,0l-3-3C3.402,6.816,3.402,6.185,3.793,5.793"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretLeft_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretLeft_black_16px.svg
deleted file mode 100644
index e2f0d5f06..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretLeft_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1893.971 16 16" enable-background="new 13 1893.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M14,1901.97c0,3.866,3.134,7,7,7c3.865,0,7-3.134,7-7c0-3.866-3.135-7-7-7C17.133,1894.97,14,1898.104,14,1901.97z"/>
-<path fill="#FFFFFF" d="M22.707,1898.263c0.195,0.195,0.293,0.451,0.293,0.707s-0.098,0.512-0.293,0.707l-2.293,2.293l2.293,2.293
-	c0.391,0.391,0.391,1.023,0,1.414s-1.023,0.391-1.414,0l-3-3c-0.391-0.391-0.391-1.023,0-1.414l3-3
-	C21.684,1897.873,22.316,1897.873,22.707,1898.263z"/>
-<rect x="13" y="1893.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretLeft_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretLeft_white_16px.svg
deleted file mode 100644
index 9948c7da2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretLeft_white_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-0.5 -0.5 16 16" enable-background="new -0.5 -0.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M0,7.5C0,11.642,3.356,15,7.5,15c4.142,0,7.5-3.357,7.5-7.5C15,3.357,11.641,0,7.5,0C3.356,0,0,3.357,0,7.5
-	 M9.207,3.793C9.401,3.988,9.5,4.244,9.5,4.5S9.401,5.012,9.207,5.207L6.914,7.5l2.293,2.292c0.392,0.391,0.392,1.023,0,1.414
-	s-1.023,0.391-1.414,0l-3-3c-0.392-0.391-0.392-1.023,0-1.414l3-3C8.184,3.402,8.815,3.402,9.207,3.793"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretRight_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretRight_black_16px.svg
deleted file mode 100644
index 066861ed1..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretRight_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1925.971 16 16" enable-background="new 13 1925.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M28,1933.969c0-3.866-3.134-7-7-7c-3.865,0-7,3.134-7,7c0,3.866,3.135,7,7,7C24.867,1940.969,28,1937.835,28,1933.969z"/>
-<path fill="#FFFFFF" d="M19.293,1937.676c-0.195-0.195-0.293-0.451-0.293-0.707s0.098-0.512,0.293-0.707l2.293-2.293l-2.293-2.293
-	c-0.391-0.391-0.391-1.023,0-1.414s1.023-0.391,1.414,0l3,3c0.391,0.391,0.391,1.023,0,1.414l-3,3
-	C20.316,1938.067,19.684,1938.067,19.293,1937.676z"/>
-<rect x="13" y="1925.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretRight_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretRight_white_16px.svg
deleted file mode 100644
index e615bff39..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretRight_white_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-0.5 -0.5 16 16" enable-background="new -0.5 -0.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M15,7.5C15,3.357,11.644,0,7.5,0C3.358,0,0,3.357,0,7.5S3.358,15,7.5,15C11.644,15,15,11.643,15,7.5
-	 M5.793,11.207C5.599,11.012,5.5,10.756,5.5,10.5s0.099-0.512,0.293-0.707L8.086,7.5L5.793,5.207c-0.392-0.391-0.392-1.023,0-1.414
-	s1.023-0.391,1.414,0l3,3c0.392,0.391,0.392,1.023,0,1.414l-3,3C6.816,11.598,6.185,11.598,5.793,11.207"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretUp_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretUp_black_16px.svg
deleted file mode 100644
index 75da89c50..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretUp_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1861.971 16 16" enable-background="new 13 1861.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M21,1862.971c-3.866,0-7,3.134-7,7c0,3.865,3.134,7,7,7c3.866,0,7-3.135,7-7C28,1866.105,24.866,1862.971,21,1862.971z"/>
-<path fill="#FFFFFF" d="M24.707,1871.678c-0.195,0.195-0.451,0.293-0.707,0.293s-0.512-0.098-0.707-0.293L21,1869.385l-2.293,2.293
-	c-0.391,0.391-1.023,0.391-1.414,0s-0.391-1.023,0-1.414l3-3c0.391-0.391,1.023-0.391,1.414,0l3,3
-	C25.098,1870.655,25.098,1871.288,24.707,1871.678z"/>
-<rect x="13" y="1861.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretUp_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretUp_white_16px.svg
deleted file mode 100644
index 13b63b49d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/circleCaretUp_white_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-0.5 -0.5 16 16" enable-background="new -0.5 -0.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M7.5,0C3.357,0,0,3.356,0,7.5C0,11.642,3.357,15,7.5,15S15,11.642,15,7.5C15,3.356,11.643,0,7.5,0
-	 M11.207,9.207C11.012,9.401,10.756,9.5,10.5,9.5S9.988,9.401,9.793,9.207L7.5,6.914L5.207,9.207c-0.391,0.392-1.023,0.392-1.414,0
-	s-0.391-1.023,0-1.414l3-3c0.391-0.392,1.023-0.392,1.414,0l3,3C11.598,8.184,11.598,8.815,11.207,9.207"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/clearAlarm.svg b/client/client-editor/src/main/resources/webapp/resources/16px/clearAlarm.svg
deleted file mode 100644
index 6a566bede..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/clearAlarm.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M12,7c0-1.709-0.984-2.682-2.304-2.93C9.343,2.229,8.717,1,8,1S6.657,2.229,6.304,4.07
-			C4.984,4.318,4,5.291,4,7c0,3-2,3.76-2,4.5C2,12.881,4.687,14,8,14s6-1.119,6-2.5C14,10.76,12,10,12,7z"/>
-		<path fill="#1D1D1B" d="M8,15.25C8,15.664,7.664,16,7.25,16h-1.5C5.336,16,5,15.664,5,15.25l0,0c0-0.414,0.336-0.75,0.75-0.75h1.5
-			C7.664,14.5,8,14.836,8,15.25L8,15.25z"/>
-	</g>
-	<path fill="none" stroke="#8E8E8D" stroke-miterlimit="10" d="M12,2c3,0,3.5,1.687,3.5,5"/>
-	<path fill="none" stroke="#8E8E8D" stroke-miterlimit="10" d="M12,3.5c1.104,0,2,1.09,2,3.5"/>
-	<path fill="none" stroke="#8E8E8D" stroke-miterlimit="10" d="M4,2C1,2,0.5,3.687,0.5,7"/>
-	<path fill="none" stroke="#8E8E8D" stroke-miterlimit="10" d="M4,3.5C2.896,3.5,2,4.59,2,7"/>
-	<g>
-		<g>
-			<g>
-				<path fill="#89BA17" d="M10,12.5c-0.4,0-0.776-0.156-1.06-0.438l-3-3.001C5.656,8.778,5.5,8.401,5.5,8s0.156-0.778,0.439-1.061
-					C6.223,6.656,6.6,6.5,7,6.5s0.777,0.156,1.061,0.439l1.838,1.838l3.949-4.738C14.133,3.697,14.553,3.5,15,3.5
-					c0.35,0,0.69,0.123,0.959,0.347c0.636,0.53,0.722,1.478,0.193,2.113l-5,6.001c-0.271,0.323-0.666,0.519-1.084,0.537L10,12.5z"/>
-				<path fill="#FFFFFF" d="M15,4c0.226,0,0.453,0.076,0.64,0.231c0.424,0.354,0.481,0.984,0.128,1.409l-5,6
-					c-0.18,0.215-0.442,0.346-0.723,0.358C10.03,12,10.015,12,10,12c-0.265,0-0.519-0.105-0.707-0.293l-3-3
-					c-0.391-0.39-0.391-1.024,0-1.414C6.488,7.098,6.744,7,7,7s0.512,0.098,0.707,0.293l2.226,2.226l4.299-5.159
-					C14.429,4.123,14.713,4,15,4 M15,3L15,3c-0.596,0-1.157,0.263-1.537,0.721L9.865,8.037L8.414,6.586C8.036,6.208,7.534,6,7,6
-					S5.964,6.208,5.586,6.586C5.208,6.963,5,7.465,5,8s0.208,1.037,0.586,1.415l3,2.999C8.965,12.792,9.467,13,10,13h0.032
-					l0.078-0.003c0.54-0.024,1.066-0.285,1.425-0.715l5.001-6.002c0.342-0.411,0.504-0.929,0.456-1.461s-0.301-1.014-0.711-1.355
-					C15.92,3.164,15.466,3,15,3L15,3z"/>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/clearAlarm_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/clearAlarm_white.svg
deleted file mode 100644
index ce0786197..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/clearAlarm_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 15"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#89ba17;}</style></defs><title>ebIcon_clearAlarm_white</title><path class="cls-1" d="M11.94,6.5A2.74,2.74,0,0,0,9.65,3.57C9.3,1.73,8.67.5,8,.5S6.62,1.73,6.27,3.57A2.74,2.74,0,0,0,4,6.5c0,3-2,3.76-2,4.5,0,1.38,2.67,2.5,6,2.5s6-1.12,6-2.5C13.93,10.26,11.94,9.5,11.94,6.5Z" transform="translate(0 -0.5)"/><path class="cls-1" d="M8,14.75a.75.75,0,0,1-.75.75H5.72A.75.75,0,0,1,5,14.75H5A.75.75,0,0,1,5.72,14H7.21a.75.75,0,0,1,.75.75Z" transform="translate(0 -0.5)"/><path class="cls-1" d="M15.92,6.5h-1c0-3.53-.64-4.5-3-4.5V1C15.62,1,15.92,3.6,15.92,6.5Z" transform="translate(0 -0.5)"/><path class="cls-1" d="M14.43,6.5h-1c0-1.85-.57-3-1.49-3v-1C13.14,2.5,14.43,3.55,14.43,6.5Z" transform="translate(0 -0.5)"/><path class="cls-1" d="M1,6.5H0C0,3.6.3,1,4,1V2C1.64,2,1,3,1,6.5Z" transform="translate(0 -0.5)"/><path class="cls-1" d="M2.49,6.5h-1c0-2.95,1.29-4,2.49-4v1C3.06,3.5,2.49,4.65,2.49,6.5Z" transform="translate(0 -0.5)"/><path class="cls-2" d="M10,11.65a1,1,0,0,1-.7-.29l-3-3a1,1,0,0,1,0-1.41,1,1,0,0,1,1.41,0L10,9.17,14.24,4a1,1,0,0,1,1.4-.13,1,1,0,0,1,.13,1.41l-5,6a1,1,0,0,1-.72.36h0" transform="translate(0 -0.5)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/clock_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/clock_black_16px.svg
deleted file mode 100644
index 68f773bae..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/clock_black_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     width="16px" height="16px" viewBox="-0.5 0.5 16 16" enable-background="new -0.5 0.5 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="3280.971"/>
-<rect x="13" y="2597.971" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<polyline fill="none" stroke="#000000" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
-    10,11 7.5,8.5 7.5,4.5 "/>
-<g>
-    <path d="M7.5,2.5c3.309,0,6,2.691,6,6s-2.691,6-6,6s-6-2.691-6-6S4.191,2.5,7.5,2.5 M7.5,0.5c-4.418,0-8,3.582-8,8
-        c0,4.418,3.582,8,8,8c4.418,0,8-3.582,8-8C15.5,4.082,11.918,0.5,7.5,0.5L7.5,0.5z"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/clock_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/clock_white_16px.svg
deleted file mode 100644
index 8d845dda5..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/clock_white_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     width="16px" height="16px" viewBox="-0.5 0.5 16 16" enable-background="new -0.5 0.5 16 16" xml:space="preserve">
-<rect display="none" fill="#FFFFFF" width="87" height="3280.971"/>
-<rect x="13" y="2597.971" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<polyline fill="none" stroke="#FFFFFF" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
-    10,11 7.5,8.5 7.5,4.5 "/>
-<g>
-    <path fill="#FFFFFF" d="M7.5,2.5c3.309,0,6,2.691,6,6s-2.691,6-6,6s-6-2.691-6-6S4.191,2.5,7.5,2.5 M7.5,0.5c-4.418,0-8,3.582-8,8
-        c0,4.418,3.582,8,8,8c4.418,0,8-3.582,8-8C15.5,4.082,11.918,0.5,7.5,0.5L7.5,0.5z"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/close_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/close_white_16px.svg
deleted file mode 100644
index 012cfca8d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/close_white_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-4 -4 16 16" enable-background="new -4 -4 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M5.477,3.999l2.218-2.215c0.408-0.409,0.408-1.071,0-1.478c-0.408-0.409-1.069-0.409-1.478,0L3.999,2.523
-	L1.784,0.307c-0.409-0.409-1.07-0.409-1.478,0c-0.409,0.406-0.409,1.068,0,1.478l2.217,2.215L0.307,6.217
-	c-0.409,0.408-0.409,1.069,0,1.478C0.51,7.898,0.777,8,1.046,8C1.313,8,1.58,7.898,1.784,7.694l2.215-2.219l2.218,2.219
-	C6.421,7.898,6.688,8,6.955,8S7.49,7.898,7.694,7.694c0.408-0.408,0.408-1.069,0-1.478L5.477,3.999z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/comment_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/comment_white.svg
deleted file mode 100644
index c6445e502..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/comment_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 15.5"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_comment_white</title><path class="cls-1" d="M13,0H3A3,3,0,0,0,0,3v6a3,3,0,0,0,3,3v3c0,.55.38.76.85.47L9.4,11.92H13a3,3,0,0,0,3-3V3A3,3,0,0,0,13,0Z"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/connected_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/connected_black_16px.svg
deleted file mode 100644
index b1175aa01..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/connected_black_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2821.971 16 16" enable-background="new 13 2821.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M26.801,2825.152c0.266-0.269,0.266-0.709,0-0.979c-0.265-0.27-0.699-0.27-0.963,0l-1.182,1.201
-	c-0.023,0.022-0.04,0.047-0.058,0.072c-1.341-0.913-3.058-0.719-4.598,0.524l5,5c1.202-1.514,1.317-3.172,0.521-4.537
-	c0.034-0.023,0.067-0.049,0.098-0.08L26.801,2825.152z"/>
-<path d="M18.372,2827.433c-1.392,1.546-1.736,3.631-0.893,5.077c-0.034,0.023-0.067,0.05-0.098,0.08l-1.182,1.201
-	c-0.266,0.269-0.266,0.709,0,0.979c0.265,0.27,0.699,0.27,0.963,0l1.182-1.2c0.023-0.022,0.04-0.048,0.058-0.072
-	c1.44,0.98,3.607,0.648,5.186-0.848L18.372,2827.433z"/>
-<rect x="13" y="2821.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/connectionError_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/connectionError_black_16px.svg
deleted file mode 100644
index 546580d7d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/connectionError_black_16px.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2853.971 16 16" enable-background="new 13 2853.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<line fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="16" y1="2863.969" x2="19" y2="2860.969"/>
-<line fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="19" y1="2866.969" x2="22" y2="2863.969"/>
-<path d="M20.536,2866.191l0.928,0.944c0.132,0.134,0.132,0.355,0,0.489l-0.24,0.245c-0.132,0.135-0.351,0.135-0.482,0l-5.641-5.731
-	c-0.134-0.134-0.134-0.354,0-0.489l0.24-0.245c0.132-0.134,0.348-0.134,0.48,0l0.931,0.944l0.723,0.734l2.339,2.376L20.536,2866.191
-	z M15.535,2862.241c0.112-0.114,0.229-0.221,0.346-0.323l5.171,5.251c-0.101,0.12-0.206,0.238-0.318,0.351
-	c-1.587,1.613-3.848,1.985-5.331,0.975c-0.019,0.024-0.035,0.05-0.058,0.072l-1.182,1.2c-0.264,0.27-0.698,0.27-0.963,0
-	c-0.266-0.269-0.266-0.709,0-0.979l1.182-1.201c0.03-0.031,0.063-0.057,0.098-0.08C13.602,2866.004,13.998,2863.802,15.535,2862.241
-	z"/>
-<path d="M26.466,2861.7c-0.112,0.114-0.229,0.222-0.346,0.323l-5.171-5.251c0.101-0.12,0.206-0.237,0.318-0.351
-	c1.587-1.613,3.848-1.985,5.331-0.976c0.019-0.024,0.035-0.049,0.058-0.072l1.182-1.201c0.264-0.27,0.698-0.27,0.963,0
-	c0.266,0.269,0.266,0.709,0,0.979l-1.182,1.201c-0.03,0.031-0.063,0.057-0.098,0.08C28.399,2857.937,28.003,2860.139,26.466,2861.7z
-	"/>
-<circle fill="#E32219" cx="25" cy="2865.97" r="4"/>
-<path fill="#FFFFFF" d="M25.873,2865.971l1.311-1.309c0.188-0.195,0.188-0.509,0-0.701l-0.176-0.175c-0.193-0.19-0.507-0.19-0.697,0
-	l-1.31,1.311l-1.312-1.311c-0.19-0.193-0.504-0.193-0.697,0l-0.176,0.175c-0.188,0.192-0.188,0.506,0,0.701l1.311,1.309
-	l-1.311,1.311c-0.188,0.191-0.188,0.505,0,0.697l0.176,0.175c0.193,0.193,0.507,0.193,0.697,0l1.312-1.31l1.31,1.31
-	c0.19,0.193,0.504,0.193,0.697,0l0.176-0.175c0.188-0.192,0.188-0.506,0-0.697L25.873,2865.971z"/>
-<rect x="13" y="2853.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/controllingNode.svg b/client/client-editor/src/main/resources/webapp/resources/16px/controllingNode.svg
deleted file mode 100644
index 204ef3efa..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/controllingNode.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" overflow="visible" enable-background="new 0 0 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path d="M8,1.201c0.203,0,0.383,0.112,0.473,0.293l6.273,12.542c0.08,0.161,0.07,0.358-0.025,0.514
-	c-0.096,0.154-0.268,0.251-0.449,0.251H1.729c-0.185,0-0.353-0.094-0.45-0.252c-0.096-0.154-0.104-0.351-0.022-0.514L7.529,1.492
-	C7.617,1.314,7.8,1.201,8,1.201 M8,0C7.345,0,6.746,0.371,6.455,0.957L0.183,13.498c-0.269,0.535-0.239,1.174,0.075,1.682
-	C0.573,15.689,1.13,16,1.729,16h12.542c0.6,0,1.156-0.311,1.471-0.82c0.314-0.508,0.344-1.146,0.074-1.682L9.546,0.957
-	C9.253,0.371,8.654,0,8,0"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/copy_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/copy_black_16px.svg
deleted file mode 100644
index 07adffb1f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/copy_black_16px.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1061.971 16 16" enable-background="new 13 1061.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M28.707,1071.263c-0.42-0.346-1.861-1.973-2.707-2.747v-2.046c0-2-1.947-2.5-2.5-2.5h-2v-0.5c0-0.276-0.225-0.5-0.5-0.5v0
-	h-1.982v0.004c-0.006,0-0.012-0.003-0.018-0.003c-0.276,0-0.5,0.224-0.5,0.5v0.5h-2c-2,0-2.3,1.947-2.3,2.5v8
-	c0,2,1.747,2.401,2.3,2.401c0,0,0.234,0.117,3.989,0.099c0.555,0.749,1.641,1,2.011,1c0,0,3.989,0,4,0c2,0,2.5-1.947,2.5-2.5v-3.5
-	C29,1071.714,28.92,1071.439,28.707,1071.263z M17.5,1075.97c-2,0-2.5-0.5-2.5-2.5c0,0,0-5.979,0-6c0-1.828,0.418-2.403,2.018-2.488
-	C17,1066.47,17,1066.47,17,1066.47v0c0,0.276,0.224,0.5,0.5,0.5v0h1.518H21h1.5v-0.001c0.275,0,0.5-0.224,0.5-0.499
-	c0-0.024,0-0.069-0.04-1.499c1.618,0.012,2.04,0.662,2.04,2.5v0.5l-3,0c-1,0-2,1-2,2v6C18.936,1075.97,18.308,1075.97,17.5,1075.97z
-	 M28,1074.47c0,2-0.5,2.5-2.5,2.5c0,0,0,0-2,0s-2.5-0.5-2.5-2.5c0,0,0-2.98,0-3c0-2,0.5-2.5,2.5-2.5c1,0,1.5,0,1.5,0s0,1.448,0,2
-	v0.231v0.002c0.106,0.437,0.529,0.768,1,0.768c0.553,0,2,0,2,0S28,1074.443,28,1074.47z"/>
-<rect x="13" y="1061.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/copy_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/copy_white_16px.svg
deleted file mode 100644
index 85326a53c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/copy_white_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-0.5 -0.5 16 16" enable-background="new -0.5 -0.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M14.707,8.294C14.287,7.947,12.846,6.32,12,5.547V3.5c0-2-1.947-2.5-2.5-2.5h-2V0.5C7.5,0.225,7.275,0,7,0
-	H5.018v0.005C5.012,0.005,5.006,0,5,0C4.724,0,4.5,0.225,4.5,0.5V1h-2C0.5,1,0,2.947,0,3.5v8c0,2,1.947,2.5,2.5,2.5
-	c0,0,0.234,0.02,3.989,0c0.555,0.749,1.641,1,2.011,1h4c2,0,2.5-1.946,2.5-2.5V9C15,8.744,14.92,8.47,14.707,8.294 M3.5,13
-	c-2,0-2.5-0.5-2.5-2.5v-6c0-1.827,0.418-2.402,2.018-2.487C3,3.5,3,3.5,3,3.5C3,3.776,3.224,4,3.5,4h1.518H7h1.5V3.999
-	C8.775,3.999,9,3.775,9,3.5C9,3.476,9,3.431,8.96,2C10.578,2.014,11,2.663,11,4.5V5H8.5C6.5,5,6,6.948,6,7.5V13H3.5z M14,11.5
-	c0,2-0.5,2.5-2.5,2.5h-2c-2,0-2.5-0.5-2.5-2.5v-3C7,6.5,7.5,6,9.5,6H11v2v0.23v0.002C11.105,8.669,11.529,9,12,9h2V11.5z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/coreSubscriber_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/coreSubscriber_black_16px.svg
deleted file mode 100644
index bb5a37be8..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/coreSubscriber_black_16px.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="-1.5 0.5 16 16" enable-background="new -1.5 0.5 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<rect x="8" y="229.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<path d="M8.854,12.427c0.006,0.004,0.014,0.006,0.019,0.011c0.104,0.059,0.211,0.114,0.323,0.157
-	c0.039,0.016,0.08,0.025,0.121,0.037c0.086,0.029,0.17,0.06,0.261,0.075c0.137,0.027,0.278,0.043,0.424,0.043
-	c0.144,0,0.286-0.016,0.423-0.043c0.092-0.016,0.176-0.046,0.262-0.075c0.039-0.012,0.082-0.021,0.121-0.037
-	c0.111-0.043,0.217-0.099,0.322-0.157c0.005-0.005,0.012-0.007,0.018-0.011c0.111-0.065,0.215-0.142,0.312-0.225v-0.001
-	c0.483-0.412,0.793-1.017,0.793-1.701c0-1.241-1.006-2.25-2.249-2.25S7.751,9.257,7.751,10.5C7.75,11.323,8.195,12.033,8.854,12.427
-	z"/>
-<path d="M10,14.5c-1.123,0-2.551-0.665-3.018-1.771c-0.59,0.732-0.475,1.529-0.475,2.4c0,0.273,0,0.607,0,0.607
-	c0,0.294,0.488,0.763,0.768,0.763h1.531c0.002,0,0.002,0,0.002,0c0.307,0,0.646,0,1.188,0s0.882,0,1.188,0c0,0,0,0,0.002,0h1.545
-	c0.265,0,0.76-0.497,0.76-0.776c0,0,0-0.383,0-0.656c0-0.887,0.113-1.646-0.518-2.385C12.494,13.898,11.122,14.5,10,14.5z"/>
-<g>
-	<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="8.5" y1="6.28" x2="12.5" y2="6.28"/>
-	<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="-1.5" y1="6.28" x2="2.5" y2="6.28"/>
-	<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="8.5" y1="10.28" x2="12.5" y2="10.28"/>
-	<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="-1.5" y1="10.28" x2="2.5" y2="10.28"/>
-	<g>
-		<path d="M5.5,12.5c-2.344,0-4.25-1.906-4.25-4.25C1.25,5.907,3.156,4,5.5,4s4.25,1.907,4.25,4.25C9.75,10.594,7.844,12.5,5.5,12.5
-			z M5.5,5.5c-1.517,0-2.75,1.233-2.75,2.75S3.983,11,5.5,11s2.75-1.233,2.75-2.75S7.017,5.5,5.5,5.5z"/>
-		<path d="M5.5,5.25c1.654,0,3,1.347,3,3c0,1.654-1.346,3-3,3s-3-1.346-3-3C2.5,6.597,3.846,5.25,5.5,5.25 M5.5,4.25
-			c-2.21,0-4,1.791-4,4c0,2.21,1.79,4,4,4s4-1.79,4-4C9.5,6.041,7.71,4.25,5.5,4.25L5.5,4.25z"/>
-	</g>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/core_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/core_black_16px.svg
deleted file mode 100644
index d2932b341..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/core_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<rect x="8" y="197.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="11" y1="6" x2="15" y2="6"/>
-<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="1" y1="6" x2="5" y2="6"/>
-<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="11" y1="10" x2="15" y2="10"/>
-<line fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" x1="1" y1="10" x2="5" y2="10"/>
-<g>
-	<path d="M8,12.22c-2.343,0-4.25-1.906-4.25-4.25c0-2.343,1.907-4.25,4.25-4.25c2.344,0,4.25,1.907,4.25,4.25
-		C12.25,10.313,10.344,12.22,8,12.22z M8,5.22c-1.517,0-2.75,1.233-2.75,2.75S6.483,10.72,8,10.72s2.75-1.233,2.75-2.75
-		S9.517,5.22,8,5.22z"/>
-	<path d="M8,4.97c1.654,0,3,1.347,3,3c0,1.654-1.346,3-3,3s-3-1.346-3-3C5,6.316,6.346,4.97,8,4.97 M8,3.97c-2.21,0-4,1.791-4,4
-		c0,2.21,1.79,4,4,4s4-1.79,4-4C12,5.761,10.21,3.97,8,3.97L8,3.97z"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/cut_black.svg b/client/client-editor/src/main/resources/webapp/resources/16px/cut_black.svg
deleted file mode 100644
index c1392bd36..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/cut_black.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1829.971 16 16" enable-background="new 13 1829.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M22,1835.384c0,0,0.872,1.164,1.291,1.304c0,0,0.869-1.461,1.961-3.417c0.295-0.529-0.386-3.31-1.089-1.911
-	C23.311,1833.058,23.121,1833.849,22,1835.384z"/>
-<path d="M24,1839.233c-0.538-0.262-1.038-0.441-1.359-0.711c-3.974-4.011-4.708-7.552-5.641-7.552c-1,0-1,1.501-1,1.501
-	c2.292,3.753,5.614,7.403,5.614,7.403s0.297,0.459,0.386,1.096h0.667c0.055-0.453,0.187-0.817,0.459-0.949
-	c0.248-0.12,0.553-0.501,0.874-0.395V1839.233z"/>
-<g>
-	<path d="M18.208,1839.771L18.208,1839.771c0.119,0,0.231,0.02,0.333,0.058c0.234,0.089,0.412,0.276,0.527,0.556
-		c0.227,0.552,0.161,1.32-0.176,2.055c-0.521,1.136-1.451,1.73-2.101,1.73c-0.119,0-0.231-0.02-0.333-0.059
-		c-0.235-0.089-0.412-0.276-0.527-0.556c-0.227-0.552-0.161-1.32,0.176-2.055C16.628,1840.366,17.559,1839.771,18.208,1839.771
-		 M18.208,1838.971c-1.05,0-2.219,0.87-2.828,2.197c-0.731,1.596-0.375,3.25,0.795,3.693c0.197,0.074,0.404,0.11,0.617,0.11
-		c1.05,0,2.219-0.87,2.828-2.197c0.731-1.596,0.375-3.249-0.795-3.693C18.628,1839.007,18.42,1838.971,18.208,1838.971
-		L18.208,1838.971z"/>
-</g>
-<g>
-	<path d="M23.792,1839.771L23.792,1839.771c0.649,0,1.58,0.594,2.101,1.73c0.336,0.735,0.402,1.503,0.176,2.055
-		c-0.115,0.28-0.292,0.467-0.527,0.556c-0.103,0.039-0.214,0.058-0.333,0.058c-0.649,0-1.58-0.594-2.101-1.73
-		c-0.336-0.735-0.402-1.503-0.176-2.055c0.115-0.28,0.292-0.468,0.527-0.556C23.561,1839.791,23.672,1839.771,23.792,1839.771
-		 M23.792,1838.971c-0.212,0-0.42,0.035-0.617,0.11c-1.17,0.443-1.526,2.097-0.795,3.693c0.608,1.327,1.778,2.197,2.828,2.197
-		c0.212,0,0.42-0.036,0.617-0.11c1.171-0.443,1.527-2.097,0.795-3.693C26.011,1839.841,24.841,1838.971,23.792,1838.971
-		L23.792,1838.971z"/>
-</g>
-<rect x="13" y="1829.972" display="none" opacity="0.2" fill="#E94E47" width="16" height="15.998"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/cut_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/cut_white.svg
deleted file mode 100644
index 83c752993..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/cut_white.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-2 -1 16 16" enable-background="new -2 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M6.614,8.903c0,0-3.322-2.936-5.614-6.69c0,0,0.465-2.701,1.023-1.957c0.56,0.747,1.644,3.283,5.617,7.295
-	c0.791,0.664,2.651,0.727,3.564,2.954c0.057,0.139-2.027-1.965-3.079-1.455c-1.052,0.511-0.034,4.441-0.422,3.865
-	C6.626,11.312,6.614,8.903,6.614,8.903"/>
-<path fill="#FFFFFF" d="M6.939,4.413c0,0,0.933,1.164,1.352,1.304c0,0,0.869-1.461,1.961-3.416c0.295-0.528-0.386-3.31-1.089-1.911
-	C8.311,2.086,8.061,2.877,6.939,4.413"/>
-<path fill="#FFFFFF" d="M3.502,8.388C2.417,7.943,1,8.89,0.338,10.505c-0.663,1.613-0.319,3.283,0.764,3.729
-	c1.085,0.444,2.501-0.503,3.164-2.118C4.929,10.503,4.586,8.833,3.502,8.388 M3.599,11.843c-0.437,1.066-1.373,1.691-2.09,1.398
-	c-0.714-0.295-0.941-1.396-0.503-2.463c0.437-1.066,1.372-1.691,2.087-1.396C3.811,9.677,4.035,10.777,3.599,11.843"/>
-<path fill="#FFFFFF" d="M7.277,12.116c0.663,1.615,2.079,2.563,3.164,2.119c1.083-0.447,1.427-2.117,0.764-3.73
-	C10.543,8.89,9.126,7.944,8.041,8.388C6.957,8.833,6.614,10.503,7.277,12.116 M8.45,9.382c0.715-0.295,1.649,0.33,2.087,1.396
-	s0.211,2.168-0.503,2.463c-0.717,0.293-1.652-0.332-2.09-1.398C7.508,10.778,7.732,9.677,8.45,9.382"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/database_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/database_black_16px.svg
deleted file mode 100644
index 20e572ae3..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/database_black_16px.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 453.97 16 16" enable-background="new 8 453.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16,454.97c-3.864,0-6,1.112-6,2.484c0,2.302,0,2.469,0,4.51
-	c0,2.042,0,2.084,0,4.483c0,1.372,2.136,2.481,6,2.481c3.865,0,6-1.109,6-2.481c0-2.441,0-2.608,0-4.483s0-2.208,0-4.51
-	C22,456.083,19.865,454.97,16,454.97z M16,467.153c-3.273,0-4.928-0.94-4.928-2.104c0-0.301,0.116-0.585,0.337-0.844
-	c0.633,0.74,2.164,1.259,4.591,1.259s3.959-0.518,4.592-1.259c0.221,0.259,0.337,0.543,0.337,0.844
-	C20.929,466.213,19.273,467.153,16,467.153z M16,463.495c-3.273,0-4.928-0.941-4.928-2.104c0-0.301,0.116-0.585,0.337-0.844
-	c0.633,0.74,2.164,1.259,4.591,1.259s3.959-0.518,4.592-1.259c0.221,0.259,0.337,0.543,0.337,0.844
-	C20.929,462.554,19.273,463.495,16,463.495z M16,459.839c-3.273,0-4.928-0.788-4.928-1.803c0-1.015,1.654-1.809,4.928-1.809
-	s4.929,0.794,4.929,1.809C20.929,459.05,19.273,459.839,16,459.839z"/>
-<rect x="8" y="453.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/deactivate_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/deactivate_black_16px.svg
deleted file mode 100644
index 10b7e8bf2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/deactivate_black_16px.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path d="M5.219,8.943c0.012,0.008,0.024,0.015,0.037,0.022c0.206,0.13,0.418,0.248,0.643,0.339c0.078,0.033,0.16,0.053,0.239,0.082
-	C6.31,9.445,6.479,9.51,6.657,9.545C6.93,9.604,7.211,9.637,7.5,9.637s0.571-0.033,0.844-0.092c0.18-0.035,0.347-0.1,0.521-0.158
-	c0.078-0.029,0.161-0.049,0.239-0.082c0.223-0.092,0.434-0.209,0.641-0.339c0.013-0.007,0.026-0.014,0.037-0.022
-	c0.221-0.14,0.426-0.302,0.618-0.48c0,0,0,0,0-0.001c0.961-0.883,1.579-2.179,1.579-3.643C11.979,2.157,9.974,0,7.5,0
-	C5.028,0,3.022,2.157,3.022,4.819C3.022,6.579,3.91,8.103,5.219,8.943z"/>
-<path d="M12.68,8.484c-1.273,1.997-3.135,3.266-5.211,3.266c-2.076,0-3.936-1.269-5.209-3.266c-1.502,1.497-1.242,3.13-1.242,4.934
-	c0,0.516,0,1.146,0,1.146C1.017,15.116,1.916,16,2.434,16h2.833c0.001,0,0.003,0,0.003,0c0.568,0,1.199,0,2.198,0
-	c1.001,0,1.631,0,2.201,0h0.002h2.863c0.489,0,1.4-0.938,1.4-1.465c0,0,0-0.719,0-1.234C13.935,11.497,14.183,9.979,12.68,8.484z"/>
-<path display="none" fill="#89BA17" d="M15.726,12.401c0.203-0.138,0.22-0.674,0-0.811l0,0l0,0c0,0-5.985-3.6-6.144-3.6
-	C9.265,7.992,9.01,8.247,9.01,8.563v6.865C9.01,15.744,9.265,16,9.582,16C9.742,16,15.726,12.401,15.726,12.401z"/>
-<path fill="#E32219" d="M14.864,8.001H9.181c-0.625,0-1.136,0.516-1.136,1.144v5.711C8.045,15.484,8.556,16,9.181,16h5.684
-	C15.489,16,16,15.484,16,14.856V9.146C16,8.518,15.489,8.001,14.864,8.001z"/>
-<path display="none" fill="#E32219" d="M13.729,12.516l1.931-1.931c0.356-0.356,0.356-0.933,0-1.287
-	c-0.356-0.355-0.932-0.355-1.287,0l-1.93,1.932l-1.931-1.932c-0.357-0.355-0.933-0.355-1.286,0c-0.356,0.354-0.356,0.931,0,1.287
-	l1.93,1.931l-1.93,1.932c-0.356,0.354-0.356,0.93,0,1.286C9.403,15.91,9.637,16,9.87,16c0.232,0,0.465-0.09,0.643-0.267l1.931-1.931
-	l1.93,1.931C14.551,15.91,14.783,16,15.017,16c0.232,0,0.467-0.09,0.644-0.267c0.356-0.356,0.356-0.933,0-1.286L13.729,12.516z"/>
-<circle display="none" fill="#E32219" cx="12" cy="12" r="4"/>
-<path fill="#FFFFFF" d="M12.873,12.002l1.311-1.309c0.188-0.195,0.188-0.51,0-0.701l-0.176-0.176c-0.193-0.189-0.508-0.189-0.697,0
-	L12,11.127l-1.311-1.311c-0.191-0.193-0.504-0.193-0.697,0L9.816,9.992c-0.189,0.191-0.189,0.506,0,0.701l1.311,1.309l-1.311,1.311
-	c-0.189,0.191-0.189,0.504,0,0.697l0.176,0.174c0.193,0.193,0.506,0.193,0.697,0L12,12.875l1.311,1.309
-	c0.189,0.193,0.504,0.193,0.697,0l0.176-0.174c0.188-0.193,0.188-0.506,0-0.697L12.873,12.002z"/>
-<g display="none">
-	<circle display="inline" fill="#89BA17" cx="11.973" cy="11.973" r="4.027"/>
-	<path display="inline" fill="#FFFFFF" d="M11.473,14.532c-0.152,0-0.299-0.06-0.407-0.169L9.34,12.638
-		c-0.224-0.225-0.224-0.59,0-0.813c0.225-0.225,0.59-0.225,0.813,0l1.28,1.279l2.474-2.967c0.204-0.244,0.566-0.277,0.811-0.073
-		c0.244,0.203,0.276,0.565,0.073,0.81l-2.876,3.451c-0.104,0.125-0.255,0.2-0.416,0.207C11.49,14.531,11.481,14.532,11.473,14.532z"
-		/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/deactivate_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/deactivate_white.svg
deleted file mode 100644
index 944db318c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/deactivate_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 16"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#e32219;}</style></defs><title>ebIcon_deactivate_white</title><path class="cls-1" d="M5.22,8.94l0,0a4.07,4.07,0,0,0,.64.34l.24.08a3.86,3.86,0,0,0,2.21.16,4.16,4.16,0,0,0,.52-.16l.24-.08A4.27,4.27,0,0,0,9.74,9l0,0a4.28,4.28,0,0,0,.62-.48h0A4.93,4.93,0,0,0,12,4.82,4.66,4.66,0,0,0,7.5,0,4.66,4.66,0,0,0,3,4.82,4.88,4.88,0,0,0,5.22,8.94Z" transform="translate(-1)"/><path class="cls-1" d="M12.68,8.48a6.34,6.34,0,0,1-5.21,3.27A6.33,6.33,0,0,1,2.26,8.48C.76,10,1,11.61,1,13.42v1.15A1.93,1.93,0,0,0,2.43,16h10.1a2,2,0,0,0,1.4-1.47V13.3C13.93,11.5,14.18,10,12.68,8.48Z" transform="translate(-1)"/><path class="cls-2" d="M14.86,8H9.18A1.14,1.14,0,0,0,8,9.15v5.71A1.14,1.14,0,0,0,9.18,16h5.68A1.14,1.14,0,0,0,16,14.86V9.15A1.14,1.14,0,0,0,14.86,8Z" transform="translate(-1)"/><path class="cls-1" d="M12.87,12l1.31-1.31a.51.51,0,0,0,0-.7L14,9.82a.5.5,0,0,0-.7,0L12,11.13,10.69,9.82a.49.49,0,0,0-.7,0L9.82,10a.5.5,0,0,0,0,.7L11.13,12,9.82,13.31a.5.5,0,0,0,0,.7l.18.17a.49.49,0,0,0,.7,0L12,12.88l1.31,1.31a.49.49,0,0,0,.7,0l.18-.17a.5.5,0,0,0,0-.7Z" transform="translate(-1)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/delete_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/delete_black_16px.svg
deleted file mode 100644
index 37e389d5a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/delete_black_16px.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 773.971 16 16" enable-background="new 13 773.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M26,777.018H15c-0.553,0-1,0.193-1,0.746c0,0.552,0.447,0.731,1,0.731v9.522c0,1.105,0.896,1.953,2,1.953h7
-	c1.104,0,2-0.848,2-1.953v-9.522c0.553,0,1-0.18,1-0.731C27,777.211,26.553,777.018,26,777.018z M16.752,787.613v-8.191
-	c0-0.413,0.334-0.748,0.748-0.748s0.748,0.335,0.748,0.748v8.191c0,0.414-0.334,0.748-0.748,0.748S16.752,788.027,16.752,787.613z
-	 M19.752,787.613v-8.191c0-0.413,0.335-0.748,0.748-0.748s0.748,0.335,0.748,0.748v8.191c0,0.414-0.335,0.748-0.748,0.748
-	S19.752,788.027,19.752,787.613z M22.752,787.613v-8.191c0-0.413,0.335-0.748,0.748-0.748s0.748,0.335,0.748,0.748v8.191
-	c0,0.414-0.335,0.748-0.748,0.748S22.752,788.027,22.752,787.613z M16.693,776.469c-0.248-0.169-0.316-0.505-0.148-0.755
-	c0.047-0.071,1.193-1.744,3.955-1.744s3.908,1.673,3.956,1.744c0.168,0.252,0.1,0.592-0.152,0.76
-	c-0.094,0.063-0.199,0.092-0.303,0.092c-0.178,0-0.352-0.086-0.457-0.244c-0.032-0.047-0.896-1.256-3.044-1.256
-	s-3.012,1.209-3.047,1.26C17.281,776.573,16.942,776.638,16.693,776.469z"/>
-<rect x="13" y="773.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/delete_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/delete_white_16px.svg
deleted file mode 100644
index ba887721d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/delete_white_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1.5 0 16 16" enable-background="new -1.5 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M12,3.048H1c-0.553,0-1,0.192-1,0.746c0,0.552,0.447,0.73,1,0.73v9.522c0,1.104,0.896,2,2,2h7
-	c1.104,0,2-0.896,2-2V4.524c0.553,0,1-0.179,1-0.73C13,3.24,12.553,3.048,12,3.048 M2.752,13.643V5.452
-	c0-0.413,0.334-0.749,0.748-0.749s0.748,0.335,0.748,0.749v8.191c0,0.414-0.334,0.748-0.748,0.748S2.752,14.057,2.752,13.643
-	 M5.752,13.643V5.452c0-0.413,0.335-0.749,0.748-0.749s0.748,0.335,0.748,0.749v8.191c0,0.414-0.335,0.748-0.748,0.748
-	S5.752,14.057,5.752,13.643 M8.752,13.643V5.452c0-0.413,0.335-0.749,0.748-0.749c0.412,0,0.748,0.335,0.748,0.749v8.191
-	c0,0.414-0.336,0.748-0.748,0.748C9.087,14.391,8.752,14.057,8.752,13.643 M2.693,2.499C2.445,2.33,2.377,1.994,2.545,1.744
-	C2.592,1.673,3.738,0,6.5,0s3.908,1.673,3.955,1.744c0.168,0.252,0.1,0.592-0.152,0.76C10.209,2.565,10.104,2.596,10,2.596
-	c-0.178,0-0.352-0.086-0.457-0.244C9.512,2.305,8.648,1.096,6.5,1.096S3.488,2.305,3.453,2.354C3.281,2.603,2.942,2.668,2.693,2.499
-	"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/deprecated_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/deprecated_16px.svg
deleted file mode 100644
index f28de08c8..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/deprecated_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#F6B966" d="M15.742,15.182C15.426,15.691,14.872,16,14.27,16H1.729c-0.6,0-1.156-0.309-1.471-0.818
-	c-0.315-0.508-0.344-1.146-0.076-1.682L6.454,1.143C6.747,0.557,7.347,0.001,8,0.001c0.654,0,1.254,0.556,1.547,1.141l6.27,12.357
-	C16.086,14.036,16.057,14.673,15.742,15.182z"/>
-<rect x="7" y="5" fill="#FFFFFF" width="2" height="5"/>
-<rect x="7" y="12" fill="#FFFFFF" width="2" height="2"/>
-<rect x="0" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/detach_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/detach_black_16px.svg
deleted file mode 100644
index 43769d7c7..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/detach_black_16px.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<rect x="8" y="389.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<path d="M9,0.5c-1.654,0-3,1.346-3,3V4v2v4c0,1.425,0.645,2.5,1.5,2.5h1H9c0.579,0,1-0.631,1-1.5V4H9v7
-	c0,0.249-0.061,0.422-0.104,0.5H8.5h-1C7.401,11.5,7,11.018,7,10V6V4V3.5c0-1.103,0.897-2,2-2c1.104,0,2,0.897,2,2V8v2v1.5
-	c0,1.654-1.346,3-3,3c-1.626,0-3-2.061-3-4.5V4H4v6c0,3.032,1.794,5.5,4,5.5s4-1.794,4-4V10V8V3.5C12,1.846,10.654,0.5,9,0.5z"/>
-<line fill="none" stroke="#E32219" stroke-width="1.5" stroke-miterlimit="10" x1="2" y1="14" x2="14" y2="1"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/detach_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/detach_white.svg
deleted file mode 100644
index 588734610..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/detach_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13.1 15.01"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#e32219;}</style></defs><title>ebIcon_detach_white</title><path class="cls-1" d="M8.5.5a3,3,0,0,0-3,3V10c0,1.42.64,2.5,1.5,2.5H8.5c.58,0,1-.63,1-1.5V4h-1v7a1.09,1.09,0,0,1-.1.5H7c-.1,0-.5-.48-.5-1.5V3.5a2,2,0,0,1,4,0v8a3,3,0,0,1-3,3c-1.63,0-3-2.06-3-4.5V4h-1v6c0,3,1.79,5.5,4,5.5a4,4,0,0,0,4-4v-8A3,3,0,0,0,8.5.5Z" transform="translate(-0.95 -0.49)"/><rect class="cls-2" x="-1.35" y="6.75" width="17.69" height="1.5" transform="translate(-4.05 7.43) rotate(-47.29)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/dialogInfo_blue.svg b/client/client-editor/src/main/resources/webapp/resources/16px/dialogInfo_blue.svg
deleted file mode 100644
index 7a186a3c8..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/dialogInfo_blue.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 453.971 16 16" enable-background="new 13 453.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<circle fill="#00A9D4" cx="21" cy="461.97" r="8"/>
-<path fill="#FFFFFF" d="M20,461.97c0-0.55,0.45-1,1-1l0,0c0.55,0,1,0.45,1,1v4c0,0.55-0.45,1-1,1l0,0c-0.55,0-1-0.45-1-1V461.97z"/>
-<path fill="#FFFFFF" d="M20,457.77c0-0.44,0.36-0.8,0.8-0.8h0.4c0.44,0,0.8,0.36,0.8,0.8v0.4c0,0.44-0.36,0.8-0.8,0.8h-0.4
-	c-0.44,0-0.8-0.36-0.8-0.8V457.77z"/>
-<rect x="13" y="453.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/dialogInfo_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/dialogInfo_white.svg
deleted file mode 100644
index 5248d4cdd..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/dialogInfo_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_dialogInfo_white</title><path class="cls-1" d="M8,.5A7.5,7.5,0,1,0,15.5,8,7.5,7.5,0,0,0,8,.5m0,13A1.49,1.49,0,1,1,9.5,12,1.49,1.49,0,0,1,8,13.49M9,8.81a1,1,0,1,1-2,0V3.18a1,1,0,1,1,2,0Z" transform="translate(-0.5 -0.5)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/disconnected_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/disconnected_black_16px.svg
deleted file mode 100644
index 4c718239e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/disconnected_black_16px.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2789.971 16 16" enable-background="new 13 2789.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<line fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="16" y1="2799.97" x2="19" y2="2796.97"/>
-<line fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="19" y1="2802.97" x2="22" y2="2799.97"/>
-<path d="M20.536,2802.192l0.928,0.944c0.132,0.134,0.132,0.355,0,0.489l-0.24,0.245c-0.132,0.135-0.351,0.135-0.482,0l-5.641-5.731
-	c-0.134-0.134-0.134-0.354,0-0.489l0.24-0.245c0.132-0.134,0.348-0.134,0.48,0l0.931,0.944l0.723,0.734l2.339,2.376L20.536,2802.192
-	z M15.535,2798.242c0.112-0.114,0.229-0.221,0.346-0.323l5.171,5.251c-0.101,0.12-0.206,0.238-0.318,0.351
-	c-1.587,1.613-3.848,1.985-5.331,0.975c-0.019,0.024-0.035,0.05-0.058,0.072l-1.182,1.2c-0.264,0.27-0.698,0.27-0.963,0
-	c-0.266-0.269-0.266-0.709,0-0.979l1.182-1.201c0.03-0.031,0.063-0.057,0.098-0.08C13.602,2802.005,13.998,2799.803,15.535,2798.242
-	z"/>
-<path d="M26.466,2797.701c-0.112,0.114-0.229,0.222-0.346,0.323l-5.171-5.251c0.101-0.12,0.206-0.237,0.318-0.351
-	c1.587-1.613,3.848-1.985,5.331-0.976c0.019-0.024,0.035-0.049,0.058-0.072l1.182-1.201c0.264-0.27,0.698-0.27,0.963,0
-	c0.266,0.269,0.266,0.709,0,0.979l-1.182,1.201c-0.03,0.031-0.063,0.057-0.098,0.08C28.399,2793.938,28.003,2796.14,26.466,2797.701
-	z"/>
-<rect x="13" y="2789.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/document_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/document_white_16px.svg
deleted file mode 100644
index c4d6468f6..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/document_white_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<path fill="#FFFFFF" d="M11.633,3.266c-0.122-0.129-0.247-0.261-0.369-0.395c-0.124-0.132-0.247-0.267-0.367-0.398
-	C10.041,1.532,9.531,1,9,1H5C3.897,1,3,1.967,3,3.154v9.693C3,14.034,3.897,15,5,15h6c1.103,0,2-0.966,2-2.153V5.308
-	C13,4.736,12.506,4.187,11.633,3.266z M11.668,11.843c0,0.594-0.11,1.203-0.662,1.203H4.993c-0.552,0-0.736-0.548-0.732-1.199V4.154
-	C4.234,3.249,4.469,2.9,5.021,2.9l3.442-0.016C9.081,2.9,9,3.651,9,4.129V4.77c0,0.296,0.226,0.538,0.5,0.538H11
-	c0.709,0.004,0.668,0.999,0.668,1.535V11.843z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/download_black.svg b/client/client-editor/src/main/resources/webapp/resources/16px/download_black.svg
deleted file mode 100644
index e9bff8d3e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/download_black.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 197.971 16 16" enable-background="new 13 197.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M20.293,209.677c0.195,0.196,0.451,0.293,0.707,0.293s0.512-0.098,0.707-0.293l5-5c0.391-0.39,0.391-1.023,0-1.414
-	c-0.391-0.39-1.023-0.39-1.414,0L22,206.556v-6.586c0-0.552-0.448-1-1-1s-1,0.448-1,1v6.586l-3.293-3.293
-	c-0.391-0.39-1.023-0.39-1.414,0c-0.391,0.391-0.391,1.024,0,1.414L20.293,209.677z"/>
-<path d="M27,210.97H15c-0.552,0-1,0.448-1,1s0.448,1,1,1h12c0.552,0,1-0.448,1-1S27.552,210.97,27,210.97z"/>
-<rect x="13" y="197.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/download_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/download_white.svg
deleted file mode 100644
index 640cab65d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/download_white.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13.5 14">
-    <defs>
-        <style>.cls-1{fill:#fff;}</style>
-    </defs>
-    <title>ebIcon_import_white</title>
-    <path class="cls-1" d="M13.79,14.06H1.71a.72.72,0,0,0,0,1.44H13.79a.72.72,0,0,0,0-1.44Z" transform="translate(-1 -1.5)"/>
-    <path class="cls-1"
-          d="M7.25,11.9a.71.71,0,0,0,1,0l5-5.09a.73.73,0,0,0,0-1,.7.7,0,0,0-1,0L8.46,9.65V2.22A.71.71,0,1,0,7,2.22V9.65L3.22,5.79a.7.7,0,0,0-1,0,.73.73,0,0,0,0,1Z"
-          transform="translate(-1 -1.5)"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/download_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/download_white_16px.svg
deleted file mode 100644
index 94b7c06bc..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/download_white_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M14,13.001H2c-0.552,0-1,0.448-1,1S1.448,15,2,15h12c0.552,0,1-0.447,1-0.999S14.552,13.001,14,13.001z"/>
-<path fill="#FFFFFF" d="M7.293,11.707C7.488,11.902,7.744,12,8,12s0.512-0.098,0.707-0.293l5-5c0.391-0.39,0.391-1.023,0-1.414
-	c-0.391-0.39-1.023-0.39-1.414,0L9,8.586V2c0-0.552-0.448-1-1-1S7,1.448,7,2v6.586L3.707,5.293c-0.391-0.39-1.023-0.39-1.414,0
-	c-0.391,0.391-0.391,1.024,0,1.414L7.293,11.707z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/draft.svg b/client/client-editor/src/main/resources/webapp/resources/16px/draft.svg
deleted file mode 100644
index f218b8828..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/draft.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 13.4 15" style="enable-background:new 0 0 13.4 15;" xml:space="preserve">
-<path fill="#999999" d="M8.2,7c1-1,2-2,3.4-3.3c-0.2-0.4-0.5-0.8-0.8-1.1C10.5,2.3,10.1,2,9.7,1.8C8.3,3.2,7.4,4.2,6.4,5.2
-	c0.4,0.2,0.7,0.5,1,0.8C7.7,6.3,7.9,6.6,8.2,7"/>
-<path fill="#999999" d="M6.4,7C6.1,6.7,5.7,6.4,5.3,6.2L5.2,6.4C5,6.6,3.5,8.9,4,9.4s2.8-1,3-1.2l0.2-0.2C7,7.7,6.7,7.3,6.4,7"/>
-<path fill="#999999" d="M11.7,1.7c0.3,0.3,0.6,0.6,0.8,1l0.1-0.1c0.6-0.5,1.3-1.3,0.4-2.2s-1.7-0.1-2.2,0.4l-0.1,0.1
-	C11,1.1,11.4,1.4,11.7,1.7"/>
-<path fill="#999999" d="M9.9,7v6c0,0.6-0.3,0.9-0.9,0.9H2c-0.6,0-0.8-0.4-0.8-0.9V4c0-0.6,0.3-0.9,0.8-0.9h5L8,2H2C0.9,2,0,2.9,0,4v9
-	c0,1.1,0.9,2,2,2h7c1.1,0,2-0.9,2-2V6L9.9,7z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/duplicate_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/duplicate_black_16px.svg
deleted file mode 100644
index 34d7f84a6..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/duplicate_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1029.971 16 16" enable-background="new 13 1029.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M27.758,1035.337l0.008-0.01l-0.044-0.043c-0.013-0.012-0.023-0.024-0.037-0.035L27,1034.564l-1.594-1.594l-0.686-0.685
-	c-0.182-0.193-0.436-0.315-0.722-0.315h-0.593l-1-1l-0.686-0.685c-0.182-0.193-0.436-0.315-0.722-0.315H20h-4c-1.1,0-2,0.9-2,2v10
-	c0,1.1,0.9,2,2,2h1c0,1.1,0.9,2,2,2h7c1.1,0,2-0.9,2-2v-7v-0.999C28,1035.726,27.902,1035.51,27.758,1035.337z M16,1042.97
-	c-0.551,0-1-0.447-1-1v-10c0-0.552,0.449-1,1-1h4v1v1c0,1.1,0.9,2,1.999,2H23h1v1.721v5.279c0,0.553-0.449,1-1,1H16z M27,1043.97
-	c0,0.553-0.449,1-1,1h-7c-0.551,0-1-0.447-1-1h5c1.1,0,2-0.9,2-2v-5h1h1V1043.97z"/>
-<rect x="13" y="1029.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/duplicate_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/duplicate_white_16px.svg
deleted file mode 100644
index 751a3db22..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/duplicate_white_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 0 16 16" enable-background="new -1 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M13.707,5.294c-0.475-0.391-3.248-2.411-4-3C9.489,2.123,9.256,2,9,2H8.99
-	C8.091,1.333,7.11,0.608,6.707,0.294C6.489,0.123,6.256,0,6,0H2.5C0.5,0,0,1.948,0,2.5v9c0,2,1.947,2.5,2.5,2.5h0.533
-	C3.25,15.587,4.496,16,5,16h6.5c2,0,2.5-1.946,2.5-2.5V6C14,5.744,13.92,5.47,13.707,5.294 M1,10.5v-7C1,1.5,1.5,1,3.5,1H5v1v1.022
-	V4c0,0.554,0.447,1,1,1h2h2v2v3.5c0,2-0.5,2.5-2.5,2.5h-4C1.5,13,1,12.5,1,10.5 M13,12.5c0,2-0.5,2.5-2.5,2.5H6
-	c-1.286,0-1.742-0.343-1.905-1.001C9,14,8.493,14,8.5,14c2,0,2.5-1.946,2.5-2.5V7h2V12.5z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/edit_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/edit_black_16px.svg
deleted file mode 100644
index a4dc97821..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/edit_black_16px.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 517.971 16 16" enable-background="new 13 517.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M20.417,528.848c1.295-1.285,2.509-2.489,4.235-4.229c-0.225-0.463-0.54-0.925-0.956-1.341
-	c-0.417-0.417-0.88-0.732-1.343-0.957c-1.741,1.724-2.943,2.941-4.227,4.235c0.448,0.263,0.887,0.587,1.296,0.995
-	C19.83,527.957,20.153,528.397,20.417,528.848z"/>
-<path d="M18.174,528.8c-0.414-0.413-0.876-0.727-1.334-0.95c-0.112,0.113-0.19,0.191-0.209,0.21c-0.21,0.21-2.142,3.14-1.5,3.781
-	c0.644,0.643,3.573-1.287,3.783-1.497c0.02-0.02,0.097-0.097,0.21-0.208C18.9,529.675,18.587,529.212,18.174,528.8z"/>
-<path d="M24.862,522.11c0.406,0.406,0.729,0.845,0.992,1.295c0.023-0.025,0.051-0.053,0.076-0.078
-	c0.703-0.715,1.691-1.693,0.549-2.836c-1.141-1.141-2.117-0.152-2.833,0.55c-0.025,0.025-0.054,0.052-0.079,0.076
-	C24.016,521.381,24.456,521.705,24.862,522.11z"/>
-<rect x="13" y="517.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/edit_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/edit_white_16px.svg
deleted file mode 100644
index 583ebb290..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/edit_white_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-2 -2 16 16" enable-background="new -2 -2 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M5.416,8.877c1.295-1.285,2.51-2.49,4.234-4.23C9.426,4.186,9.112,3.723,8.696,3.306
-	C8.279,2.889,7.814,2.574,7.353,2.35C5.612,4.073,4.41,5.291,3.126,6.583c0.448,0.263,0.887,0.587,1.296,0.996
-	C4.83,7.985,5.153,8.425,5.416,8.877"/>
-<path fill="#FFFFFF" d="M3.173,8.828C2.76,8.414,2.298,8.1,1.839,7.877C1.727,7.991,1.649,8.069,1.63,8.088
-	c-0.21,0.211-2.142,3.14-1.5,3.78c0.645,0.645,3.572-1.286,3.783-1.496c0.02-0.021,0.096-0.097,0.21-0.21
-	C3.9,9.702,3.587,9.24,3.173,8.828"/>
-<path fill="#FFFFFF" d="M9.86,2.14c0.406,0.406,0.73,0.844,0.993,1.294c0.022-0.024,0.05-0.052,0.075-0.077
-	c0.702-0.715,1.693-1.692,0.549-2.836C10.338-0.62,9.36,0.368,8.646,1.071C8.62,1.096,8.591,1.124,8.565,1.146
-	C9.016,1.409,9.455,1.734,9.86,2.14"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/error_red_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/error_red_16px.svg
deleted file mode 100644
index e8550355f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/error_red_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 357.971 16 16" enable-background="new 13 357.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path fill="#E32219" d="M21,357.97c-4.418,0-8,3.582-8,8c0,4.418,3.582,8,8,8s8-3.582,8-8C29,361.552,25.418,357.97,21,357.97"/>
-<path fill="#FFFFFF" d="M24.536,368.09c0.392,0.392,0.392,1.024,0,1.414c-0.194,0.195-0.451,0.293-0.707,0.293
-	s-0.512-0.098-0.707-0.293L21,367.383l-2.121,2.121c-0.195,0.195-0.451,0.293-0.707,0.293s-0.511-0.098-0.707-0.293
-	c-0.39-0.391-0.39-1.023,0-1.414l2.121-2.121l-2.121-2.121c-0.39-0.391-0.39-1.023,0-1.414c0.391-0.391,1.024-0.391,1.414,0
-	L21,364.555l2.122-2.121c0.392-0.391,1.022-0.391,1.414,0c0.392,0.391,0.392,1.023,0,1.414l-2.122,2.121L24.536,368.09z"/>
-<rect x="13" y="357.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/expand_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/expand_black_16px.svg
deleted file mode 100644
index d8c291959..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/expand_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1125.971 16 16" enable-background="new 13 1125.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M16.5,1127.97c-0.275,0-0.5,0.225-0.5,0.5v11c0,0.275,0.225,0.5,0.5,0.5s0.5-0.225,0.5-0.5v-11
-	C17,1128.195,16.775,1127.97,16.5,1127.97z"/>
-<path d="M24.609,1133.658L21,1130.171v-1.701c0-0.275-0.225-0.5-0.5-0.5s-0.5,0.225-0.5,0.5v2v7v2c0,0.275,0.225,0.5,0.5,0.5
-	s0.5-0.225,0.5-0.5v-1.699l3.609-3.489C24.824,1134.111,24.824,1133.83,24.609,1133.658z"/>
-<rect x="13" y="1125.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/export_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/export_black_16px.svg
deleted file mode 100644
index ca6633b87..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/export_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2693.971 16 16" enable-background="new 13 2693.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" d="M27,2702.97v4
-	c0,0.552-0.448,1-1,1H16c-0.552,0-1-0.448-1-1v-4"/>
-<path d="M26.767,2694.97c0.51,0,1.233,0.728,1.233,1.244v3.423c0,0.376-0.228,0.719-0.573,0.861
-	c-0.116,0.051-0.236,0.072-0.353,0.072c-0.243,0-0.479-0.094-0.654-0.273l-0.982-0.986l-4.691,4.659L19,2702.208l4.689-4.656
-	l-0.977-0.986c-0.268-0.269-0.343-0.67-0.201-1.019s0.479-0.575,0.856-0.576h3.706"/>
-<rect x="13" y="2693.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/export_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/export_white.svg
deleted file mode 100644
index ac6a9676e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/export_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_export_white</title><path class="cls-1" d="M13,15H3a2,2,0,0,1-2-2V9A1,1,0,0,1,3,9v4H13V9a1,1,0,0,1,2,0v4A2,2,0,0,1,13,15Z" transform="translate(-1 -1)"/><path class="cls-1" d="M13.77,1A1.55,1.55,0,0,1,15,2.24V5.67a.94.94,0,0,1-.57.86.88.88,0,0,1-.35.07.91.91,0,0,1-.65-.27l-1-1L7.75,10,6,8.24l4.69-4.66-1-1a.94.94,0,0,1-.2-1A.92.92,0,0,1,10.37,1h3.71" transform="translate(-1 -1)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/externalApp_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/externalApp_black_16px.svg
deleted file mode 100644
index b845c0e9d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/externalApp_black_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="13" y="1093.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<path fill="#000" d="M13.25,1C13.664,1,14,1.336,14,1.75v3c0,0.302-0.184,0.577-0.463,0.693
-	c-0.094,0.038-0.191,0.058-0.287,0.058c-0.195,0-0.387-0.077-0.531-0.221l-0.793-0.793l-3.689,3.69L6.822,6.762l3.69-3.688
-	L9.719,2.28C9.504,2.065,9.441,1.743,9.557,1.463C9.673,1.183,9.945,1.001,10.25,1H13.25"/>
-<g>
-	<path fill="none" stroke="#000" stroke-width="1.5" stroke-miterlimit="10" d="M7,2H4C2.9,2,2,2.9,2,4v8c0,1.1,0.9,2,2,2h7
-		c1.1,0,2-0.9,2-2V8"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/externalApp_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/externalApp_white_16px.svg
deleted file mode 100644
index 81d98ab54..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/externalApp_white_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-2 -1 16 16" enable-background="new -2 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M10.027,7L10,12c0,0.554-0.449,1-1,1H2c-0.552,0-1-0.446-1-1V3c0-0.551,0.448-1,1-1h3V1H2C0.9,1,0,1.9,0,3v9
-	c0,1.101,0.9,2,2,2h7c1.1,0,2-0.899,2-2V7H10.027z"/>
-<path fill="#FFFFFF" d="M11.25,0C11.664,0,12,0.337,12,0.75v3c0,0.303-0.184,0.577-0.463,0.693
-	c-0.094,0.038-0.191,0.058-0.287,0.058c-0.195,0-0.387-0.076-0.531-0.221L9.926,3.487L6.236,7.179L4.822,5.763l3.689-3.689
-	L7.719,1.28C7.504,1.065,7.441,0.743,7.557,0.464C7.672,0.184,7.945,0.001,8.25,0H11.25"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/eyeLine_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/eyeLine_black_16px.svg
deleted file mode 100644
index 9ff81593f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/eyeLine_black_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<g id="eye_11_">
-		<g>
-			<path fill="#8E8E8D" d="M8,2C3.582,2,0,7.922,0,7.922S3.582,14,8,14s8-6.078,8-6.078S12.418,2,8,2z M8,12c-2.209,0-4-1.791-4-4
-				s1.791-4,4-4s4,1.791,4,4S10.209,12,8,12z"/>
-			<circle fill="#8E8E8D" cx="8" cy="8.008" r="2"/>
-		</g>
-	</g>
-	
-		<line fill="none" stroke="#E32219" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="2" y1="2" x2="14" y2="14"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/eyeLine_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/eyeLine_white.svg
deleted file mode 100644
index 9014e1c6a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/eyeLine_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 14"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#e32219;}</style></defs><title>ebIcon_eyeLine_white</title><g id="eye"><path class="cls-1" d="M8,2C3.58,2,0,7.92,0,7.92S3.58,14,8,14s8-6.08,8-6.08S12.42,2,8,2ZM8,12a4,4,0,1,1,4-4A4,4,0,0,1,8,12Z" transform="translate(0 -1)"/><circle class="cls-1" cx="8" cy="7.01" r="2"/></g><path class="cls-2" d="M14,15a1,1,0,0,1-.71-.29l-12-12A1,1,0,0,1,2.71,1.29l12,12A1,1,0,0,1,14,15Z" transform="translate(0 -1)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/eye_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/eye_black_16px.svg
deleted file mode 100644
index 1426fc181..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/eye_black_16px.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g id="eye_15_">
-	<g>
-		<path d="M8,2C3.582,2,0,7.922,0,7.922S3.582,14,8,14s8-6.078,8-6.078S12.418,2,8,2z M8,12c-2.209,0-4-1.791-4-4
-			s1.791-4,4-4s4,1.791,4,4S10.209,12,8,12z"/>
-		<circle cx="8" cy="8.008" r="2"/>
-	</g>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/eye_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/eye_white_16px.svg
deleted file mode 100644
index 416aede3a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/eye_white_16px.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g id="eye_15_">
-	<g>
-		<path fill="#FFFFFF" d="M8,2C3.582,2,0,7.922,0,7.922S3.582,14,8,14s8-6.078,8-6.078S12.418,2,8,2z M8,12c-2.209,0-4-1.791-4-4
-			s1.791-4,4-4s4,1.791,4,4S10.209,12,8,12z"/>
-		<circle fill="#FFFFFF" cx="8" cy="8.008" r="2"/>
-	</g>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/fastForward_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/fastForward_black_16px.svg
deleted file mode 100644
index 759eb5581..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/fastForward_black_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2501.971 16 16" enable-background="new 13 2501.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M29,2509.981c0.003-0.558-0.302-1.041-0.753-1.302l0.003-0.005c0,0-5.942-4.468-6-4.501
-	c-0.718-0.414-1.635-0.168-2.049,0.549c-0.137,0.237-0.195,0.495-0.195,0.75H20v2.262c-1.746-1.312-4.709-3.538-4.75-3.562
-	c-0.718-0.414-1.635-0.168-2.049,0.549c-0.137,0.237-0.195,0.495-0.195,0.75H13v9c0,0.828,0.671,1.5,1.5,1.5
-	c0.27,0,0.748-0.207,0.748-0.207c0.034-0.02,3.004-2.245,4.752-3.556v2.263c0,0.828,0.671,1.5,1.5,1.5
-	c0.27,0,0.748-0.207,0.748-0.207c0.048-0.028,6.002-4.493,6.002-4.493l-0.003-0.005C28.693,2511.009,28.997,2510.533,29,2509.981z"
-	/>
-<rect x="13" y="2501.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/fastRewind_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/fastRewind_black_16px.svg
deleted file mode 100644
index 584f5c39d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/fastRewind_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2533.971 16 16" enable-background="new 13 2533.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M28.994,2537.47c0-0.255-0.058-0.513-0.195-0.75c-0.414-0.717-1.331-0.963-2.049-0.549c-0.041,0.024-3.004,2.25-4.75,3.562
-	v-2.262h-0.006c0-0.255-0.058-0.513-0.195-0.75c-0.414-0.717-1.331-0.963-2.049-0.549c-0.058,0.034-6,4.501-6,4.501l0.003,0.005
-	c-0.451,0.261-0.756,0.744-0.753,1.302c0.003,0.552,0.307,1.028,0.753,1.285l-0.003,0.005c0,0,5.954,4.465,6.002,4.493
-	c0,0,0.478,0.207,0.748,0.207c0.829,0,1.5-0.672,1.5-1.5v-2.263c1.748,1.311,4.718,3.536,4.752,3.556c0,0,0.478,0.207,0.748,0.207
-	c0.829,0,1.5-0.672,1.5-1.5v-9H28.994z"/>
-<rect x="13" y="2533.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/filter_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/filter_black_16px.svg
deleted file mode 100644
index a8b59ee42..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/filter_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 261.971 16 16" enable-background="new 13 261.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M14.383,264.739l-0.151-0.151C14.278,264.645,14.326,264.694,14.383,264.739z"/>
-<path d="M26,262.971H15c-0.552,0-1,0.448-1,1c0,0.237,0.094,0.446,0.232,0.617l0.151,0.151L18,268.356v5.115l0.006,0.002
-	c0,0.019-0.005,0.036-0.005,0.055c0,0.557,0.308,1.038,0.759,1.297l1.756,1.002c0.146,0.083,0.306,0.142,0.485,0.142
-	c0.552,0,1-0.447,1-0.999v-5.615l4.618-4.618l0.149-0.148c0.138-0.172,0.233-0.381,0.233-0.618
-	C27,263.419,26.552,262.971,26,262.971z"/>
-<rect x="13" y="261.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/filter_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/filter_white_16px.svg
deleted file mode 100644
index f1fc71e8f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/filter_white_16px.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1 16 16" enable-background="new -1 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M14,1.076C14,0.481,13.518,0,12.923,0H1.077C0.482,0,0,0.481,0,1.076l5,5.549v4.904
-	c0,0.598,0.328,1.273,0.923,1.51L8.077,13.9C8.672,14.139,9,13.848,9,13.256V6.625L14,1.076z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/filters_off.svg b/client/client-editor/src/main/resources/webapp/resources/16px/filters_off.svg
deleted file mode 100644
index 0bd2f1330..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/filters_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#1d1d1b;}</style></defs><title>filters_off</title><polygon class="cls-1" points="8 15 5 13 5 6 1 2 1 0 15 0 15 2 11 6 11 8 9 8 9 6 13 2 3 2 7 6 7 12 10 14 8 15"/><polygon class="cls-1" points="12 8 14 8 14 10 16 10 16 11.99 14 11.99 14 14 12 14 12 12 10 12 10 10 12 10 12 8"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/filters_on.svg b/client/client-editor/src/main/resources/webapp/resources/16px/filters_on.svg
deleted file mode 100644
index 4837b6045..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/filters_on.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#1d1d1b;}</style></defs><title>filters_on</title><polygon class="cls-1" points="8 15 5 13 5 6 1 2 1 0 15 0 15 2 11 6 11 8 9 8 9 13.33 10 14 8 15"/><polygon class="cls-1" points="12 8 14 8 14 10 16 10 16 11.99 14 11.99 14 14 12 14 12 12 10 12 10 10 12 10 12 8"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/folderClosed_black.svg b/client/client-editor/src/main/resources/webapp/resources/16px/folderClosed_black.svg
deleted file mode 100644
index 52240b0cf..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/folderClosed_black.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="13" y="2373.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<path d="M12,5h-1.186C10.398,3.841,9.297,3,8,3H7H5H4H3C1.9,3,1,3.9,1,5v7c0,1.101,0.9,2,2,2h9c1.1,0,2-0.899,2-2V7
-	C14,5.9,13.1,5,12,5z M13,13H2V7h11V13z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/folderClosed_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/folderClosed_white.svg
deleted file mode 100644
index e30d500b1..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/folderClosed_white.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1.5 -2.5 16 16" enable-background="new -1.5 -2.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M12.889,9.999L12.889,9.999C12.871,10.062,12.889,9.999,12.889,9.999"/>
-<path fill="#FFFFFF" d="M10.954,1.377C10.954,1.377,11.04,1.577,10.954,1.377C10.625,0.622,9.668,0,7.959,0H3.084
-	C1.043,0,0,1.084,0,3v7c0,0.554,0.448,1,1,1h10.766c0.789,0,1.115-0.479,1.115-1.625S12.889,10,12.889,4.153
-	C12.971,3.314,12.954,1.377,10.954,1.377 M11.812,3.855v4.979c-0.019,0.916-0.415,1.192-1.175,1.192H1.795
-	c-0.485,0-0.821-0.384-0.7-0.855V3.855C1.146,3.291,1.209,3,2.2,3h8.488C11.396,2.979,11.771,3.063,11.812,3.855"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/folder_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/folder_black_16px.svg
deleted file mode 100644
index a37080e2f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/folder_black_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 965.971 16 16" enable-background="new 13 965.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M26.5,977.971L26.5,977.971C26.482,978.033,26.5,977.971,26.5,977.971z"/>
-<path d="M25.917,969.971c-0.12,0-0.509,0-0.834,0c0-1-0.958-2-3.125-2c-0.607,0-3.417,0-4.875,0c-2.041,0-3.083,1.084-3.083,3
-	c0,0.672,0,6.591,0,7c0,0.553,0.447,0.999,1,0.999c0.449,0,9.586,0,10.377,0c0.789,0,1.121-0.994,1.123-0.998
-	c0.044-0.155,0.055-0.194,1.492-5.224C28.24,971.971,27.917,969.971,25.917,969.971z M26.811,972.35l-1.457,4.792
-	c-0.121,0.472-0.619,0.857-1.105,0.857h-7.61c-0.486,0-0.784-0.385-0.663-0.857l0.962-4.792c0.121-0.471,0.619-0.855,1.105-0.855
-	h8.105C26.634,971.495,26.932,971.88,26.811,972.35z"/>
-<rect x="13" y="965.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/folder_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/folder_white_16px.svg
deleted file mode 100644
index e1a4fe07d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/folder_white_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -2.5 16 16" enable-background="new -1 -2.5 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M12.5,9.999L12.5,9.999C12.482,10.062,12.5,9.999,12.5,9.999"/>
-<path fill="#FFFFFF" d="M11.916,2h-0.834c0-1-0.957-2-3.125-2H3.082C1.041,0,0,1.083,0,3v7c0,0.552,0.447,1,1,1h10.377
-	c0.789,0,1.121-0.996,1.123-0.999c0.043-0.156,0.055-0.195,1.492-5.224C14.24,4,13.916,2,11.916,2 M12.811,4.379l-1.457,4.792
-	c-0.121,0.471-0.619,0.856-1.105,0.856h-7.61c-0.486,0-0.784-0.386-0.663-0.856l0.962-4.792c0.121-0.471,0.619-0.856,1.104-0.856
-	h8.107C12.635,3.522,12.932,3.908,12.811,4.379"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ftpServerFunction_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ftpServerFunction_black_16px.svg
deleted file mode 100644
index 06bef0c11..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ftpServerFunction_black_16px.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 549.97 16 16" enable-background="new 8 549.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path d="M22.827,562.714c0.021-0.081,0.094-0.136,0.176-0.136H24v-1.214h-0.997c-0.082,0-0.155-0.055-0.176-0.135
-	c-0.067-0.258-0.169-0.506-0.303-0.734c-0.041-0.069-0.03-0.159,0.027-0.218l0.705-0.707l-0.857-0.855l-0.705,0.704
-	c-0.059,0.059-0.149,0.068-0.219,0.027c-0.229-0.133-0.477-0.234-0.733-0.302c-0.08-0.02-0.136-0.094-0.136-0.175v-0.998h-1.213
-	v0.998c0,0.082-0.055,0.156-0.136,0.175c-0.258,0.067-0.503,0.169-0.734,0.302c-0.07,0.041-0.16,0.031-0.218-0.027l-0.705-0.704
-	l-0.857,0.855l0.705,0.707c0.059,0.059,0.071,0.149,0.028,0.218c-0.134,0.229-0.234,0.476-0.304,0.734
-	c-0.021,0.08-0.093,0.135-0.177,0.135H16v1.214h0.996c0.084,0,0.155,0.055,0.177,0.136c0.069,0.257,0.17,0.503,0.304,0.734
-	c0.043,0.069,0.03,0.159-0.028,0.219l-0.705,0.704l0.857,0.858l0.705-0.705c0.058-0.059,0.147-0.069,0.218-0.028
-	c0.231,0.134,0.477,0.235,0.734,0.303c0.081,0.021,0.136,0.094,0.136,0.176v0.997h1.213v-0.997c0-0.082,0.056-0.155,0.136-0.176
-	c0.257-0.067,0.504-0.169,0.733-0.303c0.069-0.041,0.16-0.03,0.219,0.028l0.705,0.705l0.857-0.858l-0.705-0.704
-	c-0.058-0.06-0.068-0.149-0.027-0.219C22.658,563.216,22.76,562.97,22.827,562.714z M19.999,563.721
-	c-0.964,0-1.748-0.784-1.748-1.75c0-0.967,0.783-1.75,1.748-1.75c0.968,0,1.752,0.784,1.752,1.75
-	C21.75,562.937,20.967,563.721,19.999,563.721z"/>
-<path d="M21,551.97c0-0.552-0.447-1-1-1h-8c-0.553,0-1,0.448-1,1v1h10V551.97z"/>
-<path d="M21,553.97H11v3h9h1V553.97z M19,556.47c-0.553,0-1-0.447-1-1c0-0.553,0.447-1,1-1s1,0.447,1,1
-	C20,556.023,19.553,556.47,19,556.47z"/>
-<path d="M17.027,557.97H11v3h4.101C15.35,559.743,16.059,558.692,17.027,557.97z"/>
-<path d="M11,561.97v1c0,0.553,0.447,1,1,1h3.422c-0.268-0.613-0.422-1.288-0.422-2H11z"/>
-<rect x="8" y="549.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/ftpServer_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/ftpServer_black_16px.svg
deleted file mode 100644
index a26863cf5..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/ftpServer_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 517.97 16 16" enable-background="new 8 517.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11,529.97h10v1c0,0.553-0.447,1-1,1h-8c-0.553,0-1-0.447-1-1 M11,519.97
-	c0-0.552,0.447-1,1-1h8c0.553,0,1,0.448,1,1v1H11V519.97z M11,525.97h10v3H11V525.97z M11,521.97h10v3H11V521.97z M20,523.47
-	c0,0.553-0.447,1-1,1s-1-0.447-1-1c0-0.553,0.447-1,1-1S20,522.918,20,523.47z M20,527.469c0,0.554-0.447,1.001-1,1.001
-	s-1-0.447-1-1.001c0-0.554,0.447-0.999,1-0.999S20,526.916,20,527.469z"/>
-<rect x="8" y="517.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/fullscreenMinimise_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/fullscreenMinimise_black_16px.svg
deleted file mode 100644
index 28875b57a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/fullscreenMinimise_black_16px.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1477.971 16 16" enable-background="new 13 1477.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M14,1486.97h4c0.552,0,1,0.448,1,1v3c0,0.552-0.448,1-1,1s-1-0.448-1-1v-2h-3c-0.552,0-1-0.448-1-1
-	S13.448,1486.97,14,1486.97z"/>
-<path d="M24,1484.97h4c0.552,0,1-0.448,1-1s-0.448-1-1-1h-3v-2c0-0.552-0.448-1-1-1s-1,0.448-1,1v3
-	C23,1484.522,23.448,1484.97,24,1484.97z"/>
-<path d="M28,1486.97h-4c-0.552,0-1,0.448-1,1v3c0,0.552,0.448,1,1,1s1-0.448,1-1v-2h3c0.552,0,1-0.448,1-1
-	S28.552,1486.97,28,1486.97z"/>
-<path d="M18,1484.97h-4c-0.552,0-1-0.448-1-1s0.448-1,1-1h3v-2c0-0.552,0.448-1,1-1s1,0.448,1,1v3
-	C19,1484.522,18.552,1484.97,18,1484.97z"/>
-<rect x="13" y="1477.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/fullscreen_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/fullscreen_black_16px.svg
deleted file mode 100644
index 22dec3d72..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/fullscreen_black_16px.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1445.971 16 16" enable-background="new 13 1445.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M18,1459.97h-4c-0.552,0-1-0.448-1-1v-3c0-0.552,0.448-1,1-1s1,0.448,1,1v2h3c0.552,0,1,0.448,1,1
-	S18.552,1459.97,18,1459.97z"/>
-<path d="M28,1447.97h-4c-0.552,0-1,0.448-1,1s0.448,1,1,1h3v2c0,0.552,0.448,1,1,1s1-0.448,1-1v-3
-	C29,1448.418,28.552,1447.97,28,1447.97z"/>
-<path d="M24,1459.97h4c0.552,0,1-0.448,1-1v-3c0-0.552-0.448-1-1-1s-1,0.448-1,1v2h-3c-0.552,0-1,0.448-1,1
-	S23.448,1459.97,24,1459.97z"/>
-<path d="M14,1447.97h4c0.552,0,1,0.448,1,1s-0.448,1-1,1h-3v2c0,0.552-0.448,1-1,1s-1-0.448-1-1v-3
-	C13,1448.418,13.448,1447.97,14,1447.97z"/>
-<rect x="13" y="1445.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/gatewayFunction_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/gatewayFunction_black_16px.svg
deleted file mode 100644
index 1b93f4a36..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/gatewayFunction_black_16px.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 325.97 16 16" enable-background="new 8 325.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path d="M13.28,328.25c0.215-0.214,0.278-0.537,0.163-0.817c-0.116-0.281-0.39-0.463-0.693-0.463h-3c-0.414,0-0.75,0.336-0.75,0.75
-	v3c0,0.303,0.183,0.577,0.463,0.693c0.093,0.039,0.19,0.057,0.287,0.057c0.195,0,0.387-0.076,0.53-0.22l0.97-0.97l2.806,2.806
-	l1.061-1.061l-2.806-2.806L13.28,328.25z"/>
-<path d="M22.25,326.97h-3c-0.304,0-0.577,0.182-0.693,0.463c-0.115,0.28-0.052,0.603,0.163,0.817l0.97,0.97l-2.806,2.806
-	l1.061,1.061l2.806-2.806l0.969,0.97c0.144,0.144,0.335,0.22,0.531,0.22c0.097,0,0.194-0.019,0.287-0.057
-	c0.28-0.116,0.463-0.39,0.463-0.693v-3C23,327.306,22.664,326.97,22.25,326.97z"/>
-<path d="M14.056,334.854l-2.806,2.806l-0.97-0.97c-0.215-0.214-0.537-0.278-0.817-0.163C9.183,336.643,9,336.917,9,337.22v3
-	c0,0.414,0.336,0.75,0.75,0.75h3c0.303,0,0.577-0.183,0.693-0.463c0.115-0.28,0.052-0.603-0.163-0.817l-0.97-0.97l2.806-2.806
-	L14.056,334.854z"/>
-<path d="M22.827,338.713c0.021-0.081,0.094-0.136,0.176-0.136H24v-1.214h-0.997c-0.082,0-0.155-0.055-0.176-0.135
-	c-0.068-0.258-0.169-0.506-0.303-0.734c-0.041-0.069-0.03-0.159,0.027-0.218l0.705-0.707l-0.857-0.855l-0.705,0.704
-	c-0.059,0.059-0.149,0.068-0.219,0.027c-0.229-0.133-0.477-0.234-0.733-0.302c-0.08-0.02-0.136-0.094-0.136-0.175v-0.998h-1.213
-	v0.998c0,0.082-0.055,0.156-0.136,0.175c-0.258,0.067-0.503,0.169-0.734,0.302c-0.07,0.041-0.16,0.031-0.218-0.027l-0.705-0.704
-	l-0.857,0.855l0.705,0.707c0.059,0.059,0.071,0.149,0.028,0.218c-0.134,0.229-0.234,0.477-0.304,0.734
-	c-0.021,0.08-0.093,0.135-0.177,0.135H16v1.214h0.996c0.084,0,0.155,0.055,0.177,0.136c0.069,0.257,0.17,0.503,0.304,0.733
-	c0.043,0.069,0.03,0.159-0.028,0.219l-0.705,0.704l0.857,0.858l0.705-0.705c0.058-0.059,0.147-0.069,0.218-0.028
-	c0.231,0.134,0.477,0.235,0.734,0.303c0.081,0.021,0.136,0.094,0.136,0.176v0.997h1.213v-0.997c0-0.082,0.056-0.155,0.136-0.176
-	c0.257-0.067,0.504-0.169,0.733-0.303c0.069-0.041,0.16-0.03,0.219,0.028l0.705,0.705l0.857-0.858l-0.705-0.704
-	c-0.058-0.06-0.068-0.149-0.027-0.219C22.658,339.216,22.76,338.97,22.827,338.713z M19.999,339.721
-	c-0.964,0-1.748-0.784-1.748-1.75c0-0.967,0.784-1.75,1.748-1.75c0.968,0,1.752,0.784,1.752,1.75
-	C21.75,338.937,20.967,339.721,19.999,339.721z"/>
-<rect x="8" y="325.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/grabHandle_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/grabHandle_black_16px.svg
deleted file mode 100644
index 6e9ce6db9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/grabHandle_black_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<circle cx="5.5" cy="3.5" r="1.5"/>
-	<circle cx="5.5" cy="8.5" r="1.5"/>
-	<circle cx="5.5" cy="13.5" r="1.5"/>
-	<circle cx="10.5" cy="3.5" r="1.5"/>
-	<circle cx="10.5" cy="8.5" r="1.5"/>
-	<circle cx="10.5" cy="13.5" r="1.5"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/grabHandle_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/grabHandle_white.svg
deleted file mode 100644
index 94922fc9c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/grabHandle_white.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<circle fill="#fff" cx="5.5" cy="3.5" r="1.5"/>
-	<circle fill="#fff" cx="5.5" cy="8.5" r="1.5"/>
-	<circle fill="#fff" cx="5.5" cy="13.5" r="1.5"/>
-	<circle fill="#fff" cx="10.5" cy="3.5" r="1.5"/>
-	<circle fill="#fff" cx="10.5" cy="8.5" r="1.5"/>
-	<circle fill="#fff" cx="10.5" cy="13.5" r="1.5"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/grid3X3_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/grid3X3_black_16px.svg
deleted file mode 100644
index 20c7039c1..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/grid3X3_black_16px.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2245.971 16 16" enable-background="new 13 2245.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<g>
-	<path d="M18,2249.97c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1V2249.97z"/>
-</g>
-<g>
-	<path d="M23,2249.97c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1V2249.97z"/>
-</g>
-<g>
-	<path d="M28,2249.97c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1V2249.97z"/>
-</g>
-<g>
-	<path d="M18,2254.97c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1V2254.97z"/>
-</g>
-<g>
-	<path d="M23,2254.97c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1V2254.97z"/>
-</g>
-<g>
-	<path d="M28,2254.97c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1V2254.97z"/>
-</g>
-<g>
-	<path d="M18,2259.97c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1V2259.97z"/>
-</g>
-<g>
-	<path d="M23,2259.97c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1V2259.97z"/>
-</g>
-<rect x="13" y="2245.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/grid3x3_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/grid3x3_white.svg
deleted file mode 100644
index 6bb56b4df..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/grid3x3_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_grid3x3_white</title><rect class="cls-1" width="4" height="4" rx="1" ry="1"/><rect class="cls-1" x="5" width="4" height="4" rx="1" ry="1"/><rect class="cls-1" x="10" width="4" height="4" rx="1" ry="1"/><rect class="cls-1" y="5" width="4" height="4" rx="1" ry="1"/><rect class="cls-1" x="5" y="5" width="4" height="4" rx="1" ry="1"/><rect class="cls-1" x="10" y="5" width="4" height="4" rx="1" ry="1"/><rect class="cls-1" y="10" width="4" height="4" rx="1" ry="1"/><rect class="cls-1" x="5" y="10" width="4" height="4" rx="1" ry="1"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/grid4X4_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/grid4X4_black_16px.svg
deleted file mode 100644
index 3da4d212e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/grid4X4_black_16px.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2213.971 16 16" enable-background="new 13 2213.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<g>
-	<path d="M20,2218.97c0,1.1-0.9,2-2,2h-2c-1.1,0-2-0.9-2-2v-2c0-1.1,0.9-2,2-2h2c1.1,0,2,0.9,2,2V2218.97z"/>
-</g>
-<g>
-	<path d="M28,2218.97c0,1.1-0.9,2-2,2h-2c-1.1,0-2-0.9-2-2v-2c0-1.1,0.9-2,2-2h2c1.1,0,2,0.9,2,2V2218.97z"/>
-</g>
-<g>
-	<path d="M20,2225.97c0,1.1-0.9,2-2,2h-2c-1.1,0-2-0.9-2-2v-2c0-1.1,0.9-2,2-2h2c1.1,0,2,0.9,2,2V2225.97z"/>
-</g>
-<g>
-	<path d="M28,2225.97c0,1.1-0.9,2-2,2h-2c-1.1,0-2-0.9-2-2v-2c0-1.1,0.9-2,2-2h2c1.1,0,2,0.9,2,2V2225.97z"/>
-</g>
-<rect x="13" y="2213.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/grid4x4_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/grid4x4_white.svg
deleted file mode 100644
index 1e4222928..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/grid4x4_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_grid4x4_white</title><rect class="cls-1" width="7" height="7" rx="2" ry="2"/><rect class="cls-1" x="8" width="7" height="7" rx="2" ry="2"/><rect class="cls-1" y="8" width="7" height="7" rx="2" ry="2"/><rect class="cls-1" x="8" y="8" width="7" height="7" rx="2" ry="2"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/gridView_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/gridView_black_16px.svg
deleted file mode 100644
index bd8ff9771..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/gridView_black_16px.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2917.971 16 16" enable-background="new 13 2917.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<g>
-	<path d="M21,2927.97c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h6c0.55,0,1,0.45,1,1v2c0,0.55-0.45,1-1,1H21z"/>
-</g>
-<g>
-	<path d="M21,2932.97c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h6c0.55,0,1,0.45,1,1v2c0,0.55-0.45,1-1,1H21z"/>
-</g>
-<g>
-	<path d="M15,2932.97c-0.55,0-1-0.45-1-1v-7c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1v7c0,0.55-0.45,1-1,1H15z"/>
-</g>
-<g>
-	<path d="M14,2919.97c0-0.55,0.45-1,1-1h12c0.55,0,1,0.45,1,1v2c0,0.55-0.45,1-1,1H15c-0.55,0-1-0.45-1-1V2919.97z"/>
-</g>
-<rect x="13" y="2917.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/gridView_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/gridView_white.svg
deleted file mode 100644
index 0d5762a62..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/gridView_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_gridView_white</title><path class="cls-1" d="M8,10A1,1,0,0,1,7,9V7A1,1,0,0,1,8,6h6a1,1,0,0,1,1,1V9a1,1,0,0,1-1,1Z" transform="translate(-1 -1)"/><path class="cls-1" d="M8,15a1,1,0,0,1-1-1V12a1,1,0,0,1,1-1h6a1,1,0,0,1,1,1v2a1,1,0,0,1-1,1Z" transform="translate(-1 -1)"/><path class="cls-1" d="M2,15a1,1,0,0,1-1-1V7A1,1,0,0,1,2,6H4A1,1,0,0,1,5,7v7a1,1,0,0,1-1,1Z" transform="translate(-1 -1)"/><path class="cls-1" d="M1,2A1,1,0,0,1,2,1H14a1,1,0,0,1,1,1V4a1,1,0,0,1-1,1H2A1,1,0,0,1,1,4Z" transform="translate(-1 -1)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/help_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/help_black_16px.svg
deleted file mode 100644
index 1be2efa19..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/help_black_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 837.971 16 16" enable-background="new 13 837.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="18" y="839.971" fill="#FFFFFF" width="6" height="12"/>
-<path d="M21,837.971c-4.417,0-8,3.582-8,8c0,4.419,3.583,8,8,8c4.419,0,8-3.581,8-8C29,841.554,25.419,837.971,21,837.971z
-	 M20.98,851.776c-0.884,0-1.598-0.715-1.598-1.598s0.714-1.598,1.598-1.598s1.598,0.715,1.598,1.598S21.864,851.776,20.98,851.776z
-	 M22.685,845.67c-0.476,0.492-0.704,0.753-0.704,1.305c0,0.553-0.447,1-1,1s-1-0.447-1-1c0-1.385,0.732-2.142,1.267-2.695
-	c0.483-0.5,0.716-0.766,0.716-1.34c0-0.931,0-0.968-0.982-0.968c-0.98,0-0.98,0.019-0.98,0.995c0,0.552-0.447,1-1,1s-1-0.448-1-1
-	c0-0.972,0-2.995,2.98-2.995c2.982,0,2.982,2.08,2.982,2.968C23.963,844.347,23.225,845.112,22.685,845.67z"/>
-<rect x="13" y="837.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/help_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/help_white.svg
deleted file mode 100644
index acc485033..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/help_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_help_white</title><path class="cls-1" d="M8,.5A7.5,7.5,0,1,0,15.5,8,7.5,7.5,0,0,0,8,.5M8,13.3A1.3,1.3,0,1,1,9.3,12,1.3,1.3,0,0,1,8,13.3M9.43,7.57C9,8,8.84,8.2,8.84,8.66a.84.84,0,0,1-1.68,0A3,3,0,0,1,8.22,6.4c.4-.42.6-.64.6-1.12,0-.78,0-.81-.82-.81s-.82,0-.82.83a.84.84,0,0,1-1.68,0c0-.81,0-2.51,2.5-2.51s2.5,1.74,2.5,2.49A3.07,3.07,0,0,1,9.43,7.57" transform="translate(-0.5 -0.5)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/import_black.svg b/client/client-editor/src/main/resources/webapp/resources/16px/import_black.svg
deleted file mode 100644
index 7e9371655..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/import_black.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2725.971 16 16" enable-background="new 13 2725.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" d="M27,2734.97v4
-	c0,0.552-0.448,1-1,1H16c-0.552,0-1-0.448-1-1v-4"/>
-<path d="M20.233,2735.97c-0.51,0-1.233-0.728-1.233-1.244v-3.423c0-0.376,0.228-0.719,0.573-0.861
-	c0.116-0.051,0.236-0.072,0.353-0.072c0.243,0,0.479,0.094,0.654,0.273l0.982,0.986l4.691-4.659l1.746,1.763l-4.689,4.656
-	l0.977,0.986c0.268,0.269,0.343,0.67,0.201,1.019s-0.479,0.575-0.856,0.576h-3.706"/>
-<rect x="13" y="2725.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/import_export.svg b/client/client-editor/src/main/resources/webapp/resources/16px/import_export.svg
deleted file mode 100644
index 0a7b6423d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/import_export.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#1d1d1b;}</style></defs><title>import_export</title><path class="cls-1" d="M8,0a8,8,0,1,0,8,8A8,8,0,0,0,8,0ZM3,5,6,1,9,5H7V9H5V5Zm7,10L7,11H9V7h2v4h2Z"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/import_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/import_white.svg
deleted file mode 100644
index 68d77f1c6..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/import_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_import</title><path class="cls-1" d="M13,15H3a2,2,0,0,1-2-2V9A1,1,0,0,1,3,9v4H13V9a1,1,0,0,1,2,0v4A2,2,0,0,1,13,15Z" transform="translate(-1 -1)"/><path class="cls-1" d="M7.23,10A1.54,1.54,0,0,1,6,8.76V5.33a.94.94,0,0,1,.57-.86.87.87,0,0,1,.35-.07.91.91,0,0,1,.65.27l1,1L13.25,1,15,2.76,10.31,7.42l1,1a.94.94,0,0,1,.2,1,.92.92,0,0,1-.86.58H6.93" transform="translate(-1 -1)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/infoMsgIndicator_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/infoMsgIndicator_16px.svg
deleted file mode 100644
index 78479c07b..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/infoMsgIndicator_16px.svg
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path d="M22.923-8.587c-3.123,3.124-3.123,8.19,0,11.313c3.124,3.125,8.191,3.125,11.313,0c3.125-3.123,3.125-8.189,0-11.313
-	C31.114-11.711,26.047-11.711,22.923-8.587 M32.581-3.931c0.553,0,1,0.447,1,1c0,0.276-0.11,0.526-0.293,0.707
-	c-0.183,0.181-0.433,0.292-0.707,0.292l-3.002,0.001V1.07c0.002,0.275-0.108,0.525-0.291,0.705
-	c-0.183,0.182-0.433,0.293-0.708,0.293c-0.553,0-0.999-0.447-1-1v-2.999h-2.999c-0.554-0.001-1-0.448-1-1c0-0.552,0.446-1,1-1h2.999
-	v-3c0-0.553,0.447-1,1-1c0.554,0,1.001,0.447,1.001,1L29.579-3.93L32.581-3.931z"/>
-<path fill="#B1B3B4" d="M35.438,17.073H21.725c-0.633,0-1.144,0.516-1.144,0.878v7.625c0,0.029,0.022,0.057,0.028,0.084
-	c0.304,4.143,3.75,7.413,7.972,7.413c4.221,0,7.668-3.271,7.971-7.413c0.007-0.029,0.029-0.055,0.029-0.086v-7.646
-	C36.581,17.564,36.066,17.073,35.438,17.073z"/>
-<g>
-	<g>
-		<ellipse fill="#B1B3B4" cx="40.287" cy="5.099" rx="3.705" ry="3.87"/>
-	</g>
-	<rect x="46.186" y="-2.93" fill="#B1B3B4" width="5.844" height="6.104"/>
-	<path fill="#B1B3B4" d="M52.029,3.682h-5.846c-0.269,0-0.484-0.227-0.484-0.51V-2.93c0-0.281,0.217-0.508,0.484-0.508h5.846
-		c0.271,0,0.488,0.227,0.488,0.508v6.104C52.518,3.455,52.3,3.682,52.029,3.682z M46.673,2.664h4.87v-5.085h-4.87V2.664z"/>
-	<path fill="#B1B3B4" d="M52.089,5.375h-5.899c-0.271,0-0.489,0.231-0.489,0.393v3.425c0,0.014,0.009,0.025,0.012,0.039
-		c0.131,1.861,1.613,3.33,3.431,3.33c1.813,0,3.297-1.469,3.428-3.33c0.002-0.016,0.013-0.025,0.013-0.039V5.758
-		C52.581,5.594,52.359,5.375,52.089,5.375z"/>
-</g>
-<g>
-	<g>
-		<path d="M37.771-18.239c0,0.825-0.676,1.5-1.5,1.5h-13c-0.826,0-1.5-0.675-1.5-1.5v-13c0-0.825,0.674-1.5,1.5-1.5h13
-			c0.824,0,1.5,0.675,1.5,1.5V-18.239z"/>
-	</g>
-	<g>
-		
-			<circle fill="none" stroke="#FFFFFF" stroke-width="0.75" stroke-linecap="round" stroke-miterlimit="10" stroke-dasharray="2.5714,2.5714" cx="29.771" cy="-24.739" r="6.67"/>
-	</g>
-	<circle fill="#FFFFFF" stroke="#FFFFFF" stroke-linecap="round" stroke-miterlimit="10" cx="29.771" cy="-24.739" r="2.325"/>
-</g>
-<g>
-	<g>
-		<path d="M68.582-18.894c0,0.825-0.676,1.5-1.5,1.5h-13c-0.826,0-1.5-0.675-1.5-1.5v-13c0-0.825,0.674-1.5,1.5-1.5h13
-			c0.824,0,1.5,0.675,1.5,1.5V-18.894z"/>
-	</g>
-	<g>
-		<g>
-			<path fill="#FFFFFF" d="M57.553-21.375c-0.182,0.184-0.479,0.184-0.662,0l-0.33-0.33c-0.184-0.183-0.184-0.48,0-0.663
-				l7.049-7.046c0.185-0.183,0.482-0.183,0.662-0.002l0.332,0.332c0.183,0.183,0.183,0.479,0,0.662L57.553-21.375z"/>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M64.604-22.366c0.185,0.182,0.185,0.48,0,0.663l-0.332,0.33c-0.184,0.182-0.479,0.182-0.662,0
-				l-7.049-7.049c-0.184-0.183-0.184-0.481,0-0.662l0.332-0.332c0.183-0.181,0.479-0.181,0.66,0L64.604-22.366z"/>
-		</g>
-	</g>
-	<g>
-		
-			<circle fill="none" stroke="#FFFFFF" stroke-width="0.75" stroke-linecap="round" stroke-miterlimit="10" cx="60.582" cy="-25.394" r="7.16"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#FFFFFF" d="M68.582,27.463c-3.805,0-6.9-3.096-6.9-6.9c0-3.804,3.096-6.899,6.9-6.899s6.9,3.096,6.9,6.899
-			C75.482,24.367,72.387,27.463,68.582,27.463z"/>
-		<path d="M68.582,14.764c3.197,0,5.8,2.602,5.8,5.799c0,3.198-2.603,5.801-5.8,5.801c-3.198,0-5.8-2.603-5.8-5.801
-			C62.782,17.365,65.384,14.764,68.582,14.764 M68.582,12.563c-4.418,0-8,3.582-8,8c0,4.42,3.582,8,8,8c4.419,0,8-3.58,8-8
-			C76.582,16.145,73.001,12.563,68.582,12.563L68.582,12.563z"/>
-	</g>
-	<g>
-		
-			<line fill="none" stroke="#000000" stroke-width="2.2" stroke-linecap="round" stroke-miterlimit="10" x1="72.02" y1="20.563" x2="65.146" y2="20.563"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M-2.615-17.571c0,0.275-0.225,0.5-0.5,0.5H-7.5c-0.275,0-0.5-0.225-0.5-0.5v-14.243c0-0.275,0.225-0.5,0.5-0.5h4.385
-			c0.275,0,0.5,0.225,0.5,0.5V-17.571z"/>
-	</g>
-	<path d="M1.615-32.739"/>
-	<g>
-		<path d="M0.09-31.896c0-0.413,0.238-0.511,0.529-0.218l6.852,6.89c0.291,0.292,0.291,0.771,0,1.063l-6.852,6.89
-			c-0.291,0.293-0.529,0.194-0.529-0.218V-31.896z"/>
-	</g>
-</g>
-<g>
-	<circle fill="#31BADD" cx="8" cy="8" r="8"/>
-	<path fill="#FFFFFF" d="M8.977,4.199c-0.27,0.25-0.595,0.375-0.975,0.375c-0.377,0-0.703-0.125-0.976-0.375
-		c-0.271-0.25-0.405-0.554-0.405-0.908c0-0.354,0.137-0.66,0.405-0.912C7.298,2.127,7.625,2,8.002,2
-		c0.379,0,0.703,0.127,0.975,0.379c0.27,0.252,0.402,0.559,0.402,0.912C9.379,3.646,9.244,3.949,8.977,4.199z"/>
-	<path fill="#FFFFFF" d="M9.162,6.145C9.068,6.061,8.938,6.014,8.82,5.954C8.555,5.827,8.258,5.738,7.873,5.738
-		c-0.309,0-0.635,0.057-0.981,0.166C6.837,5.924,6.774,5.95,6.72,5.967C6.656,6.109,6.617,6.268,6.617,6.434
-		c0,0.109,0.034,0.213,0.063,0.313c0.205,0.018,0.367,0.057,0.453,0.139C7.237,6.987,7.295,7.17,7.295,7.432
-		c0,0.015-0.006,0.031-0.006,0.046C7.286,7.612,7.273,7.754,7.241,7.914C7.206,8.088,7.163,8.274,7.11,8.473l-0.58,2.048
-		c-0.051,0.215-0.088,0.407-0.11,0.577c-0.022,0.173-0.035,0.339-0.035,0.503c0,0.422,0.155,0.769,0.467,1.04
-		c0.182,0.16,0.416,0.259,0.682,0.326c0.189,0.047,0.393,0.086,0.626,0.086c0.224,0,0.426-0.024,0.615-0.061
-		c0.32-0.201,0.547-0.543,0.553-0.947c-0.189-0.02-0.346-0.057-0.438-0.129c-0.121-0.1-0.18-0.283-0.18-0.555
-		c0-0.078,0.012-0.189,0.029-0.318c0.008-0.053,0.014-0.1,0.023-0.158c0.035-0.211,0.078-0.397,0.125-0.563l0.58-2.042
-		c0.057-0.188,0.096-0.394,0.117-0.616c0.02-0.226,0.029-0.382,0.029-0.472C9.619,6.764,9.463,6.412,9.162,6.145z"/>
-</g>
-<g>
-	<g>
-		<path d="M-14.438,37.936c-0.068,0.068-0.15,0.123-0.242,0.162c-0.281,0.115-0.603,0.052-0.818-0.162l-2.121-2.12
-			c-0.293-0.293-0.293-0.769,0-1.062l2.121-2.121c0.215-0.216,0.537-0.279,0.818-0.164c0.279,0.117,0.463,0.391,0.463,0.693v4.242
-			C-14.217,37.608-14.299,37.797-14.438,37.936z M-16.027,35.283l0.311,0.311v-0.621L-16.027,35.283z"/>
-	</g>
-	<g>
-		<path d="M-16.735,34.533c-0.138,0-0.25,0.111-0.25,0.25v1c0,0.139,0.112,0.25,0.25,0.25h7.647c0.138,0,0.25-0.111,0.25-0.25v-1
-			c0-0.139-0.112-0.25-0.25-0.25H-16.735z"/>
-	</g>
-	<g>
-		<path d="M-8.058,42.814l-2.121,2.121c-0.215,0.215-0.537,0.277-0.816,0.162c-0.281-0.117-0.463-0.39-0.463-0.693l-0.002-4.242
-			c0.002-0.303,0.184-0.576,0.463-0.693c0.281-0.115,0.604-0.051,0.818,0.162l2.121,2.123C-7.765,42.045-7.765,42.521-8.058,42.814z
-			"/>
-	</g>
-	<g>
-		<path d="M-16.838,42.783c0,0.139,0.112,0.25,0.25,0.25h7.647c0.138,0,0.25-0.111,0.25-0.25v-1c0-0.139-0.112-0.25-0.25-0.25
-			h-7.647c-0.138,0-0.25,0.111-0.25,0.25V42.783z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#FFFFFF" d="M-34.664,37.307c-0.068,0.067-0.15,0.123-0.242,0.161c-0.281,0.115-0.604,0.052-0.818-0.161l-2.121-2.121
-			c-0.293-0.293-0.293-0.77,0-1.062l2.121-2.122c0.215-0.215,0.537-0.279,0.818-0.163c0.279,0.117,0.463,0.39,0.463,0.693v4.241
-			C-34.443,36.979-34.525,37.167-34.664,37.307z M-36.254,34.652l0.311,0.312v-0.621L-36.254,34.652z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M-36.961,33.902c-0.138,0-0.25,0.113-0.25,0.25v1c0,0.139,0.112,0.25,0.25,0.25h7.646
-			c0.138,0,0.25-0.111,0.25-0.25v-1c0-0.137-0.112-0.25-0.25-0.25H-36.961z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M-28.285,42.184l-2.121,2.121c-0.215,0.215-0.537,0.278-0.816,0.163c-0.281-0.116-0.463-0.39-0.463-0.692
-			l-0.002-4.242c0.002-0.305,0.184-0.577,0.463-0.693c0.281-0.115,0.604-0.052,0.818,0.162l2.121,2.122
-			C-27.992,41.415-27.992,41.891-28.285,42.184z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M-37.064,42.152c0,0.139,0.112,0.25,0.25,0.25h7.646c0.138,0,0.25-0.111,0.25-0.25v-1
-			c0-0.137-0.112-0.25-0.25-0.25h-7.646c-0.138,0-0.25,0.113-0.25,0.25V42.152z"/>
-	</g>
-</g>
-<g>
-	<path d="M-20.475-1.225c0,3.18-2.322,5.758-5.185,5.758c-2.742,0-4.986-2.362-5.174-5.353c-0.008-0.134-0.013-0.269-0.013-0.405
-		c0-3.18,2.321-5.758,5.187-5.758C-22.797-6.983-20.475-4.405-20.475-1.225z"/>
-	<polygon points="-19.254,6.813 -32.066,6.813 -30.847,-1.854 -20.475,-1.854 	"/>
-	<ellipse cx="-25.661" cy="-6.569" rx="1.403" ry="1.311"/>
-	<ellipse cx="-25.661" cy="6.813" rx="2.546" ry="1.309"/>
-</g>
-<g>
-	<path d="M1.019-8.453c0,3.18-2.321,5.758-5.186,5.758c-2.741,0-4.985-2.362-5.173-5.353c-0.008-0.134-0.013-0.269-0.013-0.405
-		c0-3.18,2.321-5.758,5.186-5.758S1.019-11.633,1.019-8.453z"/>
-	<polygon points="2.239,-0.414 -10.573,-0.414 -9.353,-9.082 1.019,-9.082 	"/>
-	<ellipse cx="-4.167" cy="-13.797" rx="1.403" ry="1.311"/>
-	<ellipse cx="-4.167" cy="-0.414" rx="2.546" ry="1.309"/>
-	<path fill="#FFFFFF" d="M-4.612-2.695c-0.213,0-0.419-0.085-0.57-0.236l-2.42-2.41c-0.315-0.314-0.315-0.823,0-1.137
-		s0.825-0.313,1.141,0l1.796,1.789l3.468-4.146c0.285-0.341,0.794-0.387,1.137-0.102c0.342,0.283,0.388,0.79,0.103,1.131
-		L-3.99-2.984c-0.146,0.173-0.356,0.278-0.583,0.288C-4.588-2.695-4.6-2.695-4.612-2.695z"/>
-</g>
-<g>
-	<g>
-		<path d="M-50.159-34.741c0,3.181-2.321,5.759-5.187,5.759c-2.741,0-4.985-2.362-5.173-5.354c-0.008-0.134-0.013-0.27-0.013-0.405
-			c0-3.18,2.32-5.758,5.186-5.758S-50.159-37.92-50.159-34.741z"/>
-		<polygon points="-48.938,-26.702 -61.75,-26.702 -60.53,-35.37 -50.159,-35.37 		"/>
-		<ellipse cx="-55.344" cy="-40.085" rx="1.403" ry="1.311"/>
-		<ellipse cx="-55.344" cy="-26.701" rx="2.547" ry="1.309"/>
-	</g>
-	
-		<line fill="none" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="bevel" stroke-miterlimit="24" x1="-58.942" y1="-34.858" x2="-57.468" y2="-29.716"/>
-	
-		<line fill="none" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="bevel" stroke-miterlimit="24" x1="-55.344" y1="-35.673" x2="-55.344" y2="-29.924"/>
-	
-		<line fill="none" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="bevel" stroke-miterlimit="24" x1="-51.7" y1="-34.858" x2="-53.172" y2="-29.716"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/info_black.svg b/client/client-editor/src/main/resources/webapp/resources/16px/info_black.svg
deleted file mode 100644
index dd55f2fda..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/info_black.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 869.971 16 16" enable-background="new 13 869.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<circle cx="21" cy="877.97" r="8"/>
-<path fill="#FFFFFF" d="M22.598,874.169c-0.271,0.25-0.596,0.375-0.975,0.375c-0.377,0-0.703-0.125-0.975-0.375
-	c-0.27-0.25-0.406-0.553-0.406-0.908c0-0.355,0.137-0.66,0.406-0.912c0.271-0.252,0.598-0.379,0.975-0.379
-	c0.379,0,0.703,0.127,0.975,0.379c0.268,0.252,0.402,0.557,0.402,0.912C23,873.617,22.865,873.919,22.598,874.169z"/>
-<path fill="#FFFFFF" d="M21.631,876.113c-0.094-0.084-0.224-0.132-0.343-0.189c-0.263-0.127-0.563-0.214-0.946-0.214
-	c-0.309,0-0.635,0.055-0.982,0.165c-0.055,0.018-0.117,0.044-0.172,0.063c-0.063,0.143-0.102,0.299-0.102,0.465
-	c0,0.111,0.034,0.212,0.063,0.313c0.204,0.017,0.366,0.056,0.452,0.138c0.105,0.103,0.162,0.284,0.162,0.546
-	c0,0.014-0.005,0.031-0.005,0.045c-0.003,0.135-0.016,0.278-0.048,0.437c-0.035,0.174-0.078,0.36-0.131,0.557L19,880.488
-	c-0.051,0.215-0.088,0.407-0.111,0.578s-0.035,0.338-0.035,0.502c0,0.421,0.156,0.767,0.467,1.041
-	c0.181,0.159,0.416,0.258,0.681,0.325c0.19,0.048,0.392,0.086,0.626,0.086c0.224,0,0.424-0.024,0.614-0.06
-	c0.322-0.202,0.547-0.542,0.553-0.948c-0.188-0.019-0.345-0.055-0.435-0.129c-0.121-0.098-0.18-0.282-0.18-0.554
-	c0-0.077,0.012-0.19,0.03-0.318c0.008-0.052,0.013-0.099,0.024-0.159c0.035-0.21,0.078-0.397,0.125-0.562l0.578-2.041
-	c0.057-0.188,0.096-0.393,0.117-0.617c0.02-0.225,0.031-0.381,0.031-0.471C22.086,876.732,21.932,876.382,21.631,876.113z"/>
-<rect x="13" y="869.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/info_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/info_white.svg
deleted file mode 100644
index 0afb2a206..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/info_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_info_white</title><path class="cls-1" d="M8,0a8,8,0,1,0,8,8A8,8,0,0,0,8,0ZM9.05,7.66a3.19,3.19,0,0,1-.12.62l-.58,2a5.12,5.12,0,0,0-.12.56c0,.06,0,.11,0,.16a2.44,2.44,0,0,0,0,.32.69.69,0,0,0,.18.55.86.86,0,0,0,.44.13,1.14,1.14,0,0,1-.55.95,3.31,3.31,0,0,1-.61.06A2.5,2.5,0,0,1,7,13a1.62,1.62,0,0,1-.68-.33,1.33,1.33,0,0,1-.47-1,3.85,3.85,0,0,1,0-.5q0-.26.11-.58l.58-2c.05-.2.1-.38.13-.56a2.43,2.43,0,0,0,0-.44s0,0,0,0a.75.75,0,0,0-.16-.55.78.78,0,0,0-.45-.14,1.15,1.15,0,0,1-.06-.31A1.14,1.14,0,0,1,6.19,6l.17-.06a3.26,3.26,0,0,1,1-.16A2.1,2.1,0,0,1,8.29,6a1.44,1.44,0,0,1,.34.19,1.34,1.34,0,0,1,.45,1C9.09,7.28,9.07,7.44,9.05,7.66ZM9.6,4.2a1.45,1.45,0,0,1-1.95,0,1.19,1.19,0,0,1-.41-.91,1.21,1.21,0,0,1,.41-.91,1.44,1.44,0,0,1,1.95,0,1.21,1.21,0,0,1,.4.91A1.2,1.2,0,0,1,9.6,4.2Z"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/invalid_icon.svg b/client/client-editor/src/main/resources/webapp/resources/16px/invalid_icon.svg
deleted file mode 100644
index c7fc9c2c2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/invalid_icon.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#E32219" d="M8.571,0H1.429C0.643,0,0,0.643,0,1.432v7.136C0,9.355,0.643,10,1.429,10h7.142C9.357,10,10,9.355,10,8.568
-	V1.432C10,0.643,9.357,0,8.571,0"/>
-<path fill="#FFFFFF" d="M6,5.272C6,5.674,5.552,6,5,6l0,0C4.448,6,4,5.674,4,5.272V1.728C4,1.326,4.448,1,5,1l0,0
-	c0.552,0,1,0.326,1,0.728V5.272z"/>
-<circle fill="#FFFFFF" cx="5" cy="8" r="1"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/jumpTo_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/jumpTo_black_16px.svg
deleted file mode 100644
index 1faad61d8..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/jumpTo_black_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2341.971 16 16" enable-background="new 13 2341.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M27,2351.575l-1.131-0.005c-0.846-7.941-11.943-6.916-11.943-0.183c0-2.85,8.116-5.693,8.929,0.17l-1.501-0.006
-	c-0.555,0.002-1,0.448-1.002,1c0.002,0.279,0.115,0.533,0.303,0.713l2.793,2.83c0.395,0.391,1.023,0.391,1.414,0l2.846-2.813
-	c0.18-0.18,0.293-0.432,0.293-0.707C27.998,2352.021,27.553,2351.575,27,2351.575z"/>
-<rect x="13" y="2341.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/lock_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/lock_black_16px.svg
deleted file mode 100644
index 7848f6dec..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/lock_black_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 933.971 16 16" enable-background="new 13 933.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M24.5,941.041v-2.071c0-1.654-1.346-3-3-3h-1c-1.654,0-3,1.346-3,3v2.071c-0.861,0.223-1.5,0.998-1.5,1.929v3
-	c0,1.104,0.896,2,2,2h6c1.104,0,2-0.896,2-2v-3C26,942.039,25.361,941.264,24.5,941.041z M20.266,937.165h1.469
-	c0.811,0,1.469,0.594,1.469,1.322v2.483h-4.406v-2.483C18.797,937.758,19.456,937.165,20.266,937.165z"/>
-<rect x="13" y="933.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/lock_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/lock_white_16px.svg
deleted file mode 100644
index cec994ffa..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/lock_white_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-3 -1.5 16 16" enable-background="new -3 -1.5 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M8,5H2C0.896,5,0,5.896,0,7v4c0,1.104,0.896,2,2,2h6c1.104,0,2-0.896,2-2V7C10,5.896,9.104,5,8,5"/>
-<path fill="#FFFFFF" d="M8.5,7L7.203,7.81V2.518c0-0.73-0.658-1.324-1.469-1.324H4.266c-0.81,0-1.469,0.594-1.469,1.324V7.81L1.5,7
-	V3c0-1.653,1.346-3,3-3h1c1.654,0,3,1.347,3,3V7z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/login.svg b/client/client-editor/src/main/resources/webapp/resources/16px/login.svg
deleted file mode 100644
index 24922efdc..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/login.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#1d1d1b;}</style></defs><title>login</title><path class="cls-1" d="M14,2.71A8,8,0,1,0,2.69,13.93c1-3.05,9.68-3.41,10.68,0A8,8,0,0,0,14,2.71Zm-4,7v0a3.1,3.1,0,0,1-.44.38,2.89,2.89,0,0,1-.46.27L9,10.46a2.63,2.63,0,0,1-.37.13,2.53,2.53,0,0,1-.6.07,2.41,2.41,0,0,1-1-.2l-.17-.06a2.91,2.91,0,0,1-.46-.27,4,4,0,0,1-1.57-3.3C4.79,4.68,6.22,3,8,3s3.2,1.68,3.2,3.81A4.16,4.16,0,0,1,10.07,9.72Z"/><path class="cls-1" d="M8,1A7,7,0,1,1,1,8,7,7,0,0,1,8,1M8,0a8,8,0,1,0,8,8A8,8,0,0,0,8,0Z"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/logout_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/logout_black_16px.svg
deleted file mode 100644
index 63b074cc2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/logout_black_16px.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 741.971 16 16" enable-background="new 13 741.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M25.086,756.282h-9.463c-0.6,0-1.088-0.472-1.088-1.052v-10.52c0-0.58,0.488-1.052,1.088-1.052h9.457
-	c0.561-0.002,2.666,1.311,2.666,1.311c0-1.654-1.346-3-3-3H16c-1.654,0-3,1.346-3,3v10c0,1.654,1.346,3,3,3h8.746
-	c1.654,0,3-1.346,3-3C27.746,754.97,25.643,756.282,25.086,756.282z"/>
-<polygon fill="#333333" points="25.746,749.798 25.746,750.142 25.918,749.97 "/>
-<path d="M28.999,749.971c0,0.25-0.073,0.491-0.261,0.668l-4.324,4.055c-0.391,0.368-1.023,0.369-1.414,0
-	c-0.391-0.369-0.391-0.967,0-1.336l2.616-2.442H19c-0.553,0-1-0.423-1-0.945c0-0.521,0.447-0.945,1-0.945h6.617L23,746.583
-	c-0.391-0.369-0.391-0.967,0-1.336c0.195-0.185,0.451-0.277,0.707-0.277s0.512,0.092,0.707,0.277l4.324,4.056
-	C28.926,749.48,28.999,749.72,28.999,749.971z"/>
-<rect x="13" y="741.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/mailRead_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/mailRead_black_16px.svg
deleted file mode 100644
index 7307b5bbd..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/mailRead_black_16px.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 709.971 16 16" enable-background="new 13 709.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M21,710.97l6.271,4.876c-0.244,0.075-0.501,0.124-0.771,0.124c-1.152,0-9.848,0-11,0c-0.271,0-0.527-0.049-0.771-0.124
-	L21,710.97z"/>
-<path d="M21,719.97l6.271,4.876c-0.244,0.075-0.501,0.124-0.771,0.124c-1.152,0-9.848,0-11,0c-0.271,0-0.527-0.049-0.771-0.124
-	L21,719.97z"/>
-<path d="M28.779,723.489c0.14-0.312,0.221-0.656,0.221-1.019c0-0.975-0.004-5.039-0.004-5.039c-0.006-0.349-0.084-0.679-0.218-0.979
-	l-4.249,3.519L28.779,723.489z"/>
-<path d="M13.222,716.452c-0.134,0.3-0.212,0.63-0.218,0.979c0,0-0.004,4.064-0.004,5.039c0,0.363,0.082,0.707,0.221,1.019
-	l4.249-3.519L13.222,716.452z"/>
-<rect x="13" y="709.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/mailRead_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/mailRead_white_16px.svg
deleted file mode 100644
index bcdd2748e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/mailRead_white_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 -1 16 16" enable-background="new 0 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M8,0l6.271,4.876C14.027,4.951,13.77,5,13.5,5c-1.152,0-9.848,0-11,0C2.229,5,1.973,4.951,1.729,4.876L8,0z"
-	/>
-<path fill="#FFFFFF" d="M8,9l6.271,4.876C14.027,13.951,13.77,14,13.5,14c-1.152,0-9.848,0-11,0c-0.271,0-0.527-0.049-0.771-0.124
-	L8,9z"/>
-<path fill="#FFFFFF" d="M15.779,12.52C15.92,12.207,16,11.863,16,11.5c0-0.975-0.004-5.039-0.004-5.039
-	c-0.006-0.349-0.084-0.679-0.219-0.979l-4.248,3.519L15.779,12.52z"/>
-<path fill="#FFFFFF" d="M0.223,5.482c-0.135,0.3-0.213,0.63-0.219,0.979c0,0-0.004,4.064-0.004,5.039
-	c0,0.363,0.082,0.707,0.221,1.02L4.471,9L0.223,5.482z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/mail_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/mail_black_16px.svg
deleted file mode 100644
index a1660f2aa..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/mail_black_16px.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 677.971 16 16" enable-background="new 13 677.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M21,686.297l6.271-5.193c-0.244-0.08-0.501-0.134-0.771-0.134c-1.152,0-9.848,0-11,0c-0.271,0-0.527,0.054-0.771,0.134
-	L21,686.297z"/>
-<path d="M28.779,689.489c0.14-0.312,0.221-0.655,0.221-1.019c0-0.975-0.004-5.039-0.004-5.039c-0.006-0.349-0.084-0.679-0.218-0.979
-	l-4.249,3.519L28.779,689.489z"/>
-<path d="M13.222,682.452c-0.134,0.3-0.212,0.63-0.218,0.979c0,0-0.004,4.064-0.004,5.039c0,0.363,0.082,0.707,0.221,1.019
-	l4.249-3.519L13.222,682.452z"/>
-<path d="M22.962,687.269l-1.324,1.097c-0.185,0.153-0.411,0.229-0.638,0.229s-0.453-0.076-0.638-0.229l-1.325-1.097l-4.308,3.567
-	c0.244,0.08,0.5,0.134,0.771,0.134c1.381,0,9.705,0,11,0c0.271,0,0.526-0.054,0.771-0.134L22.962,687.269z"/>
-<rect x="13" y="677.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/mail_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/mail_white_16px.svg
deleted file mode 100644
index a62dbd5f2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/mail_white_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 -3 16 16" enable-background="new 0 -3 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M8,5.326l6.271-5.192C14.027,0.054,13.771,0,13.5,0h-11C2.229,0,1.973,0.054,1.729,0.134L8,5.326z"/>
-<path fill="#FFFFFF" d="M15.779,8.518C15.919,8.206,16,7.863,16,7.499c0-0.974-0.004-5.039-0.004-5.039
-	c-0.006-0.348-0.084-0.679-0.218-0.979l-4.249,3.518L15.779,8.518z"/>
-<path fill="#FFFFFF" d="M0.222,1.481c-0.134,0.3-0.212,0.63-0.218,0.979c0,0-0.004,4.063-0.004,5.038
-	c0,0.363,0.082,0.707,0.221,1.02l4.249-3.52L0.222,1.481z"/>
-<path fill="#FFFFFF" d="M9.962,6.299L8.638,7.396C8.453,7.549,8.227,7.624,8,7.624S7.547,7.549,7.361,7.396L6.037,6.299L1.729,9.865
-	c0.244,0.08,0.5,0.134,0.771,0.134h11c0.271,0,0.525-0.054,0.771-0.134L9.962,6.299z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/managedFunction_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/managedFunction_black_16px.svg
deleted file mode 100644
index 885bd01e2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/managedFunction_black_16px.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 581.97 16 16" enable-background="new 8 581.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<line fill="none" stroke="#0066B3" stroke-width="2" stroke-linecap="round" stroke-linejoin="bevel" stroke-miterlimit="10" x1="10" y1="595.97" x2="11.5" y2="594.47"/>
-<line fill="none" stroke="#0066B3" stroke-width="2" stroke-linecap="round" stroke-linejoin="bevel" stroke-miterlimit="10" x1="20.5" y1="585.47" x2="22" y2="583.97"/>
-<path d="M19.652,590.569c0.053-0.333,0.062-0.67,0.025-1.004c-0.013-0.105,0.049-0.203,0.146-0.24l1.178-0.452l-0.55-1.434
-	l-1.178,0.452c-0.097,0.037-0.208,0.006-0.269-0.08c-0.196-0.274-0.429-0.521-0.691-0.73c-0.08-0.063-0.108-0.174-0.066-0.27
-	l0.512-1.155l-1.401-0.622l-0.513,1.152c-0.043,0.096-0.146,0.149-0.246,0.131c-0.331-0.053-0.669-0.061-1.003-0.024
-	c-0.103,0.013-0.203-0.049-0.24-0.146l-0.453-1.178l-1.432,0.55l0.452,1.178c0.037,0.097,0.006,0.209-0.081,0.269
-	c-0.274,0.196-0.518,0.428-0.731,0.69c-0.064,0.08-0.175,0.109-0.269,0.066l-1.152-0.512l-0.625,1.399l1.154,0.515
-	c0.096,0.043,0.151,0.143,0.132,0.245c-0.055,0.331-0.061,0.669-0.026,1.005c0.012,0.104-0.048,0.201-0.147,0.24l-1.177,0.452
-	l0.551,1.434l1.177-0.452c0.099-0.038,0.208-0.006,0.271,0.08c0.198,0.272,0.429,0.517,0.691,0.729
-	c0.082,0.063,0.108,0.174,0.066,0.271l-0.513,1.152l1.402,0.625l0.513-1.153c0.042-0.096,0.143-0.149,0.245-0.132
-	c0.334,0.053,0.67,0.062,1.005,0.024c0.105-0.013,0.203,0.049,0.24,0.146l0.453,1.178l1.432-0.55l-0.452-1.178
-	c-0.037-0.097-0.005-0.209,0.081-0.269c0.273-0.196,0.519-0.428,0.729-0.69c0.063-0.08,0.176-0.108,0.271-0.066l1.153,0.513
-	l0.624-1.403l-1.152-0.512C19.688,590.771,19.635,590.669,19.652,590.569z M16,591.97c-1.104,0-2-0.895-2-2c0-1.105,0.896-2,2-2
-	s2,0.895,2,2C18,591.075,17.104,591.97,16,591.97z"/>
-<rect x="8" y="581.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/managedGroup_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/managedGroup_black_16px.svg
deleted file mode 100644
index 2be3044a7..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/managedGroup_black_16px.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 741.97 16 16" enable-background="new 8 741.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<g>
-	<circle cx="11.5" cy="750.47" r="3.5"/>
-</g>
-<g>
-	<g>
-		<path d="M23.885,757.611c-0.137,0.223-0.378,0.359-0.641,0.359h-5.487c-0.263,0-0.506-0.137-0.644-0.359
-			c-0.139-0.222-0.15-0.502-0.033-0.736l2.743-5.487c0.128-0.255,0.39-0.417,0.677-0.417c0.285,0,0.548,0.162,0.675,0.417
-			l2.744,5.487C24.037,757.109,24.025,757.388,23.885,757.611z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M23.885,748.611c-0.137,0.223-0.378,0.359-0.641,0.359h-5.487c-0.263,0-0.506-0.137-0.644-0.359
-			c-0.139-0.222-0.15-0.502-0.033-0.736l2.743-5.487c0.128-0.255,0.39-0.417,0.677-0.417c0.285,0,0.548,0.162,0.675,0.417
-			l2.744,5.487C24.037,748.109,24.025,748.388,23.885,748.611z"/>
-	</g>
-</g>
-<rect x="8" y="741.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/managementNode_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/managementNode_black_16px.svg
deleted file mode 100644
index 8a7251b83..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/managementNode_black_16px.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 421.97 16 16" enable-background="new 8 421.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<circle cx="11.773" cy="434.177" r="1.437"/>
-<path d="M17.404,435.364l-0.714-0.3c0.052-0.29,0.089-0.584,0.089-0.887c0-0.304-0.037-0.599-0.089-0.888l0.714-0.299
-	c0.554-0.233,0.816-0.871,0.582-1.425c-0.232-0.554-0.868-0.816-1.424-0.584l-0.716,0.301c-0.329-0.462-0.731-0.864-1.194-1.191
-	l0.301-0.718c0.233-0.554-0.028-1.192-0.582-1.424c-0.559-0.233-1.194,0.029-1.424,0.582l-0.305,0.727
-	c-0.283-0.05-0.571-0.087-0.869-0.087c-0.307,0-0.604,0.037-0.895,0.09l-0.307-0.729c-0.157-0.376-0.506-0.6-0.885-0.643v4.105
-	c0.543-0.523,1.271-0.852,2.086-0.852c1.676,0,3.035,1.359,3.035,3.036c0,0-0.076,1.354-0.656,1.966h3.877
-	C17.955,435.807,17.746,435.506,17.404,435.364z"/>
-<path d="M19.733,427.979c-1.614-0.614-2.424-2.418-1.812-4.031c0.145-0.378,0.37-0.696,0.628-0.978h-2.397
-	c-0.041,0.086-0.094,0.164-0.128,0.255c-0.11,0.289-0.181,0.583-0.236,0.875l-0.825,0.028c-0.62,0.022-1.104,0.541-1.082,1.158
-	c0.016,0.467,0.312,0.855,0.722,1.01c0.135,0.053,0.281,0.08,0.436,0.073l0.822-0.027c0.145,0.559,0.383,1.088,0.703,1.57
-	l-0.567,0.595c-0.426,0.449-0.407,1.155,0.041,1.587c0.111,0.102,0.236,0.182,0.372,0.233c0.411,0.154,0.891,0.061,1.212-0.276
-	l0.56-0.589c0.263,0.158,0.534,0.302,0.83,0.414c0.287,0.109,0.577,0.178,0.868,0.235l0.028,0.808
-	c0.015,0.462,0.309,0.855,0.722,1.013c0.135,0.051,0.281,0.073,0.432,0.07c0.62-0.021,1.106-0.538,1.086-1.16l-0.025-0.799
-	c0.458-0.119,0.57-0.097,0.879-0.271v-2.466C22.156,428.115,20.897,428.423,19.733,427.979z"/>
-<path d="M20.316,426.442c0.765,0.291,1.619-0.093,1.909-0.857c0.291-0.765-0.095-1.617-0.855-1.909
-	c-0.765-0.291-1.621,0.093-1.909,0.856C19.168,425.297,19.554,426.151,20.316,426.442z"/>
-<g>
-	<path d="M20,423.97c1.103,0,2,0.897,2,2v8c0,1.103-0.897,2-2,2h-8c-1.103,0-2-0.897-2-2v-8c0-1.103,0.897-2,2-2H20 M20,422.97h-8
-		c-1.65,0-3,1.35-3,3v8c0,1.65,1.35,3,3,3h8c1.65,0,3-1.35,3-3v-8C23,424.32,21.65,422.97,20,422.97L20,422.97z"/>
-</g>
-<rect x="8" y="421.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/menu_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/menu_black_16px.svg
deleted file mode 100644
index b0149d4cc..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/menu_black_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 485.971 16 16" enable-background="new 13 485.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="15" y="488.971" width="2" height="1.999"/>
-<rect x="19" y="488.971" width="7" height="1.999"/>
-<rect x="15" y="492.971" width="2" height="1.999"/>
-<rect x="19" y="492.971" width="7" height="1.999"/>
-<rect x="15" y="496.971" width="2" height="1.999"/>
-<rect x="19" y="496.971" width="7" height="1.999"/>
-<rect x="13" y="485.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/menu_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/menu_white_16px.svg
deleted file mode 100644
index ccc8374b9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/menu_white_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-    <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-     x="0px" y="0px" width="16px" height="16px" viewBox="13 485.971 16 16" enable-background="new 13 485.971 16 16"
-     xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect fill="#FFFFFF" x="15" y="488.971" width="2" height="1.999"/>
-<rect fill="#FFFFFF" x="19" y="488.971" width="7" height="1.999"/>
-<rect fill="#FFFFFF" x="15" y="492.971" width="2" height="1.999"/>
-<rect fill="#FFFFFF" x="19" y="492.971" width="7" height="1.999"/>
-<rect fill="#FFFFFF" x="15" y="496.971" width="2" height="1.999"/>
-<rect fill="#FFFFFF" x="19" y="496.971" width="7" height="1.999"/>
-<rect x="13" y="485.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/microwave.svg b/client/client-editor/src/main/resources/webapp/resources/16px/microwave.svg
deleted file mode 100644
index 2e07e1aa0..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/microwave.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 -0.014 16 16" overflow="visible" enable-background="new 0 -0.014 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path d="M9.73,3.688c0-0.967-0.783-1.75-1.75-1.75c-0.969,0-1.75,0.783-1.75,1.75s0.781,1.75,1.75,1.75
-	C8.947,5.438,9.73,4.655,9.73,3.688"/>
-<path d="M3.951,6.143c-0.158,0-0.311-0.09-0.384-0.243C3.302,5.346,3.168,4.751,3.168,4.137c0-0.948,0.331-1.871,0.933-2.601
-	C4.251,1.355,4.52,1.33,4.7,1.479c0.182,0.149,0.207,0.417,0.058,0.599c-0.477,0.578-0.74,1.308-0.74,2.06
-	c0,0.487,0.107,0.957,0.317,1.397c0.102,0.212,0.013,0.464-0.2,0.566C4.075,6.128,4.012,6.143,3.951,6.143"/>
-<path d="M1.042,7.601c-0.158,0-0.312-0.089-0.384-0.243C0.222,6.443,0,5.465,0,4.448c0-1.564,0.547-3.09,1.54-4.294
-	c0.149-0.181,0.419-0.205,0.599-0.057c0.182,0.15,0.207,0.417,0.058,0.598C1.328,1.747,0.85,3.081,0.85,4.448
-	c0,0.889,0.194,1.744,0.576,2.544c0.102,0.212,0.012,0.465-0.2,0.566C1.166,7.587,1.104,7.601,1.042,7.601"/>
-<path d="M12.01,6.143c0.158,0,0.311-0.09,0.383-0.243c0.266-0.554,0.398-1.148,0.398-1.763c0-0.948-0.33-1.871-0.932-2.601
-	c-0.15-0.181-0.42-0.206-0.6-0.058c-0.182,0.149-0.207,0.417-0.057,0.599c0.477,0.578,0.738,1.308,0.738,2.06
-	c0,0.487-0.105,0.957-0.316,1.397c-0.102,0.212-0.012,0.464,0.201,0.566C11.885,6.128,11.947,6.143,12.01,6.143"/>
-<path d="M14.938,7.601c0.158,0,0.311-0.089,0.385-0.243c0.436-0.915,0.658-1.893,0.658-2.91c0-1.564-0.547-3.09-1.541-4.294
-	c-0.15-0.181-0.418-0.205-0.598-0.057c-0.182,0.15-0.207,0.417-0.059,0.598c0.869,1.052,1.348,2.386,1.348,3.753
-	c0,0.889-0.195,1.744-0.576,2.544c-0.102,0.212-0.014,0.465,0.199,0.566C14.814,7.587,14.877,7.601,14.938,7.601"/>
-<path d="M7.414,15.375V4.517c0-0.313,0.254-0.567,0.566-0.567s0.566,0.254,0.566,0.567v10.857c0,0.314-0.254,0.568-0.566,0.568
-	S7.414,15.689,7.414,15.375"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/minimiseFullscreen_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/minimiseFullscreen_black_16px.svg
deleted file mode 100644
index 73f08e115..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/minimiseFullscreen_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path d="M5,7H1C0.448,7,0,6.552,0,6s0.448-1,1-1h3V2c0-0.552,0.448-1,1-1s1,0.448,1,1v4C6,6.552,5.552,7,5,7z"/>
-<path d="M15,7h-4c-0.552,0-1-0.448-1-1V2c0-0.552,0.448-1,1-1s1,0.448,1,1v3h3c0.552,0,1,0.448,1,1S15.553,7,15,7z"/>
-<path d="M5,7H1C0.448,7,0,6.552,0,6s0.448-1,1-1h3V2c0-0.552,0.448-1,1-1s1,0.448,1,1v4C6,6.552,5.552,7,5,7z"/>
-<path d="M15,7h-4c-0.552,0-1-0.448-1-1V2c0-0.552,0.448-1,1-1s1,0.448,1,1v3h3c0.552,0,1,0.448,1,1S15.553,7,15,7z"/>
-<path d="M11,14.999c-0.552,0-1-0.448-1-1v-4C10,9.447,10.448,9,11,9h4c0.552,0,1,0.447,1,0.999s-0.447,1-1,1h-3v3
-	C12,14.551,11.553,14.999,11,14.999z"/>
-<path d="M5,14.999c-0.552,0-1-0.448-1-1v-3H1c-0.552,0-1-0.448-1-1S0.448,9,1,9h4c0.552,0,1,0.447,1,0.999v4
-	C6,14.552,5.553,14.999,5,14.999z"/>
-<path d="M11,14.999c-0.552,0-1-0.448-1-1v-4C10,9.447,10.448,9,11,9h4c0.552,0,1,0.447,1,0.999s-0.447,1-1,1h-3v3
-	C12,14.551,11.553,14.999,11,14.999z"/>
-<path d="M5,14.999c-0.552,0-1-0.448-1-1v-3H1c-0.552,0-1-0.448-1-1S0.448,9,1,9h4c0.552,0,1,0.447,1,0.999v4
-	C6,14.552,5.553,14.999,5,14.999z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/minus_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/minus_black_16px.svg
deleted file mode 100644
index 7c4ac161f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/minus_black_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1733.971 16 16" enable-background="new 13 1733.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M25,1740.97c0.55,0,1,0.45,1,0.999s-0.45,0.999-1,0.999h-8c-0.55,0-1-0.45-1-0.999s0.45-0.999,1-0.999H25z"/>
-<rect x="13" y="1733.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/mo.svg b/client/client-editor/src/main/resources/webapp/resources/16px/mo.svg
deleted file mode 100644
index 3fe14dfef..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/mo.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-0.013 -4.497 16 16"
-	 overflow="visible" enable-background="new -0.013 -4.497 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path d="M15.633,2.873c-0.104-0.059-0.226-0.094-0.354-0.095l-3.835-0.005c-0.201-0.937-0.779-1.79-1.676-2.304
-	c-1.68-0.967-3.837-0.39-4.808,1.284C4.759,2.101,4.639,2.472,4.567,2.847V2.781L0.711,2.776c-0.392,0-0.71,0.316-0.711,0.707
-	c0,0.263,0.143,0.491,0.355,0.613c0.104,0.06,0.225,0.095,0.353,0.095l3.859,0.006V4.154c0.185,0.969,0.76,1.857,1.682,2.389
-	c1.681,0.967,3.837,0.391,4.806-1.284c0.198-0.341,0.33-0.702,0.4-1.07l3.82,0.006c0.393,0.001,0.711-0.316,0.711-0.707
-	C15.988,3.224,15.845,2.995,15.633,2.873z M9.826,4.551C9.249,5.55,7.962,5.894,6.959,5.318C5.957,4.74,5.612,3.458,6.19,2.459
-	C6.769,1.46,8.057,1.117,9.06,1.693C10.062,2.271,10.407,3.552,9.826,4.551z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/move.svg b/client/client-editor/src/main/resources/webapp/resources/16px/move.svg
deleted file mode 100644
index ac56bc2f8..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/move.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 13.35"><defs><style>.cls-1{fill:#1d1d1b;}</style></defs><title>move</title><path class="cls-1" d="M12.49,2.12A2.17,2.17,0,0,0,11.88,2H11c0-1-1-2-3.11-2H3.09A2.72,2.72,0,0,0,0,3v7.32a1,1,0,0,0,1,1H7v-2H3c-.36,0-1,0-1-1L3,4.41a1.2,1.2,0,0,1,1-.88h8.07a.65.65,0,0,1,.66.86h0L11,6.35h2l1-1.56A2.23,2.23,0,0,0,12.49,2.12Z"/><path class="cls-1" d="M15,10.6c0,.14.08.65,0,.75L12.52,13.2a.54.54,0,0,1-.75,0,.51.51,0,0,1,0-.72h0l1.38-1.13H9a.5.5,0,1,1,0-1h4.17l-1.4-1.61a.51.51,0,0,1,0-.72h0a.54.54,0,0,1,.75,0L15,10c.1.1,0,.48,0,.62"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/multi-sort.svg b/client/client-editor/src/main/resources/webapp/resources/16px/multi-sort.svg
deleted file mode 100644
index e1d85cb11..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/multi-sort.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 14"><defs><style>.cls-1{fill:#333;}</style></defs><path class="cls-1" d="M10.77,3.6,8.55,1.24a.75.75,0,0,0-1.11,0L5.23,3.6a.88.88,0,0,0-.17.91.83.83,0,0,0,.17.26A.75.75,0,0,0,5.78,5H7v7H9V5h1.22a.78.78,0,0,0,.72-.5A.85.85,0,0,0,10.77,3.6Z" transform="translate(0 -1)"/><path class="cls-1" d="M5.94,11.5a.78.78,0,0,0-.72-.5H4V5H2v6H.78a.77.77,0,0,0-.72.5.86.86,0,0,0,.17.9l2.22,2.35a.75.75,0,0,0,1.11,0l2.22-2.35A.87.87,0,0,0,5.94,11.5Z" transform="translate(0 -1)"/><path class="cls-1" d="M15.94,11.5a.78.78,0,0,0-.72-.5H14V5H12v6H10.78a.77.77,0,0,0-.72.5.86.86,0,0,0,.17.9l2.22,2.35a.75.75,0,0,0,1.11,0l2.22-2.35A.87.87,0,0,0,15.94,11.5Z" transform="translate(0 -1)"/></svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/multi-sort_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/multi-sort_white.svg
deleted file mode 100644
index a901f7de9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/multi-sort_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 14"><defs><style>.cls-1{fill:#FFF;}</style></defs><path class="cls-1" d="M10.77,3.6,8.55,1.24a.75.75,0,0,0-1.11,0L5.23,3.6a.88.88,0,0,0-.17.91.83.83,0,0,0,.17.26A.75.75,0,0,0,5.78,5H7v7H9V5h1.22a.78.78,0,0,0,.72-.5A.85.85,0,0,0,10.77,3.6Z" transform="translate(0 -1)"/><path class="cls-1" d="M5.94,11.5a.78.78,0,0,0-.72-.5H4V5H2v6H.78a.77.77,0,0,0-.72.5.86.86,0,0,0,.17.9l2.22,2.35a.75.75,0,0,0,1.11,0l2.22-2.35A.87.87,0,0,0,5.94,11.5Z" transform="translate(0 -1)"/><path class="cls-1" d="M15.94,11.5a.78.78,0,0,0-.72-.5H14V5H12v6H10.78a.77.77,0,0,0-.72.5.86.86,0,0,0,.17.9l2.22,2.35a.75.75,0,0,0,1.11,0l2.22-2.35A.87.87,0,0,0,15.94,11.5Z" transform="translate(0 -1)"/></svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/multiSelect_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/multiSelect_black_16px.svg
deleted file mode 100644
index d71eecabe..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/multiSelect_black_16px.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2565.971 16 16" enable-background="new 13 2565.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="20" y="2566.97" width="8" height="2"/>
-<rect x="20" y="2572.97" width="8" height="2"/>
-<rect x="20" y="2578.97" width="8" height="2"/>
-<path d="M14.302,2569.093l1.4,0.8c0.091,0.052,0.194,0.079,0.297,0.079c0.059,0,0.117-0.009,0.174-0.026
-	c0.158-0.048,0.289-0.158,0.363-0.306l1.4-2.8c0.148-0.296,0.028-0.657-0.268-0.805c-0.297-0.149-0.657-0.028-0.805,0.268
-	l-1.117,2.233l-0.85-0.485c-0.287-0.164-0.653-0.064-0.818,0.223C13.914,2568.562,14.014,2568.928,14.302,2569.093z"/>
-<path d="M14.302,2575.092l1.4,0.801c0.091,0.052,0.194,0.079,0.298,0.079c0.058,0,0.117-0.009,0.174-0.026
-	c0.158-0.048,0.289-0.158,0.363-0.306l1.4-2.801c0.148-0.296,0.028-0.657-0.269-0.805c-0.295-0.148-0.657-0.028-0.805,0.268
-	l-1.117,2.234l-0.85-0.486c-0.287-0.164-0.654-0.065-0.819,0.223C13.914,2574.561,14.014,2574.928,14.302,2575.092z"/>
-<path d="M14,2581.97h4v-4h-4V2581.97z M15,2578.97h2v2h-2V2578.97z"/>
-<rect x="13" y="2565.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/multiSelect_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/multiSelect_white.svg
deleted file mode 100644
index 66c5d3208..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/multiSelect_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13 16"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_multiSelect_white</title><path class="cls-1" d="M4.5,15h-2V13h2Zm0-3h-2a1,1,0,0,0-1,1v2a1,1,0,0,0,1,1h2a1,1,0,0,0,1-1V13a1,1,0,0,0-1-1" transform="translate(-1.5)"/><rect class="cls-1" x="5" y="2" width="8" height="1"/><rect class="cls-1" x="5" y="8" width="8" height="1"/><rect class="cls-1" x="5" y="14" width="8" height="1"/><path class="cls-1" d="M3.5,4a.6.6,0,0,1-.3-.08l-1.4-.8a.6.6,0,1,1,.6-1l.85.49L4.36.33A.6.6,0,1,1,5.44.87L4,3.67A.6.6,0,0,1,3.67,4L3.5,4" transform="translate(-1.5)"/><path class="cls-1" d="M3.5,10a.59.59,0,0,1-.3-.08l-1.4-.8a.6.6,0,0,1,.6-1l.85.49L4.36,6.33a.6.6,0,1,1,1.07.54L4,9.67a.6.6,0,0,1-.36.31L3.5,10" transform="translate(-1.5)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/networkElement_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/networkElement_black_16px.svg
deleted file mode 100644
index 75f4a6d0a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/networkElement_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 69.97 16 16" enable-background="new 8 69.97 16 16" xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path d="M21.815,72.178c-0.277-0.277-0.726-0.277-1.002,0l-1.767,1.767l-1.267-1.266c-0.195-0.196-0.451-0.293-0.707-0.293
-	c-0.256,0-0.512,0.098-0.708,0.293l-5.656,5.656c-0.391,0.391-0.392,1.023,0,1.414l1.266,1.266l-1.768,1.768
-	c-0.277,0.277-0.277,0.726,0,1.002c0.138,0.138,0.32,0.208,0.501,0.208c0.181,0,0.362-0.069,0.501-0.208l1.767-1.767l1.267,1.267
-	c0.195,0.195,0.451,0.293,0.707,0.293c0.256,0,0.512-0.098,0.707-0.294l5.657-5.656c0.392-0.391,0.392-1.023,0.001-1.414
-	l-1.268-1.267l1.767-1.767C22.092,72.903,22.092,72.455,21.815,72.178z M14.95,82.388l-3.345-3.346l5.466-5.467l3.347,3.345
-	L14.95,82.388z"/>
-<rect x="8" y="69.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/networkElement_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/networkElement_white_16px.svg
deleted file mode 100644
index 0000a5c3c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/networkElement_white_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="13px" height="14px" viewBox="0 -1 13 14" enable-background="new 0 -1 13 14" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M7.072,1.605l3.346,3.345l-5.466,5.468L1.605,7.072L7.072,1.605 M7.072,0.415
-	c-0.255,0-0.511,0.098-0.707,0.293L0.709,6.365c-0.391,0.39-0.392,1.022,0,1.414l3.535,3.536c0.195,0.194,0.451,0.293,0.706,0.293
-	c0.258,0,0.514-0.099,0.709-0.294l5.656-5.656c0.393-0.391,0.393-1.024,0.002-1.414L7.779,0.708
-	C7.584,0.513,7.328,0.415,7.072,0.415"/>
-<path fill="#FFFFFF" d="M9.336,3.396c-0.182,0-0.363-0.069-0.502-0.208c-0.277-0.276-0.277-0.725,0-1.001l1.979-1.979
-	c0.277-0.276,0.725-0.276,1.002,0c0.277,0.278,0.277,0.726,0,1.003L9.836,3.188C9.697,3.326,9.518,3.396,9.336,3.396"/>
-<path fill="#FFFFFF" d="M0.709,12.022c-0.182,0-0.362-0.069-0.501-0.208c-0.277-0.276-0.277-0.725,0-1.001l1.768-1.768
-	c0.277-0.277,0.725-0.277,1.002,0c0.277,0.276,0.277,0.725,0,1.002L1.21,11.814C1.071,11.953,0.891,12.022,0.709,12.022"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/network_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/network_black_16px.svg
deleted file mode 100644
index de33f1efc..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/network_black_16px.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 37.97 16 16" enable-background="new 8 37.97 16 16" xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path d="M20.987,39.714C19.578,38.59,17.807,37.97,16,37.97c-4.411,0-8,3.589-8,8s3.589,8,8,8s8-3.589,8-8
-	C24,43.523,22.902,41.243,20.987,39.714z M11.563,51.383l0.107-0.252c0,0,0.75-1.541,0.747-1.791s-0.4-1.989-0.955-1.875
-	c-2.232,0.458-2.44-1.139-2.459-1.442C9.002,46.005,9,45.988,9,45.97c0-0.137,0.013-0.27,0.021-0.405
-	c0.573,0.006,1.425,0.06,1.727,0.321c0.469,0.406,1.912,0.084,2.69,0c0,0,0.656-1.531,1.563-1.813c0,0,0.373-0.831-0.151-1.379
-	c-0.026-0.027-1.013-0.811-1.505-0.266c-0.55,0.608-0.552,0.858-0.927,0.192s0.361-0.765-0.045-1.515
-	c-0.197-0.363-0.392-0.598-0.542-0.747c1.166-0.867,2.605-1.387,4.17-1.387c0.127,0,0.247,0.025,0.373,0.032
-	c-0.011,0.334-0.009,0.722,0.042,1.006c0.109,0.602,0.626,1.154,1.328,0.164c0.251-0.354,0.15-0.691-0.08-0.979
-	c0.288,0.071,0.573,0.147,0.846,0.252l0.001,0.056c0,0,0.34,0.338-0.191,0.926c-0.43,0.475-1.813,1.118-1.403,1.841
-	c0.503,0.888,2.428-0.488,3.573,0.585c0.907,0.85,2.299,2.323,1.979,1.206c-0.171-0.599-0.158-0.873-0.109-1.001
-	C22.766,43.946,23,44.929,23,45.97c0,0.789-0.136,1.544-0.377,2.251c-0.146-0.167-0.555-0.633-0.909-0.987
-	c-0.438-0.438-0.719-1.188-0.844-1.625s-0.688-0.75-1.094-0.75s-0.938-0.188-0.938-0.188s-0.188-0.469-0.625-0.438
-	s-1.219,0.563-1.375,1.125c0,0-0.719,1.938,0.5,2.563s2.031-0.563,1.719,2.875c0,0-0.162,0.955,0.097,1.417
-	c-0.949,0.48-2.018,0.757-3.155,0.757C14.315,52.97,12.771,52.375,11.563,51.383z"/>
-<rect x="8" y="37.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/newFile_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/newFile_black_16px.svg
deleted file mode 100644
index 4840df291..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/newFile_black_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="-0.5 0.5 16 16" enable-background="new -0.5 0.5 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="13" y="997.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<path d="M3.75,15.998c-1.241,0-2.25-1.008-2.25-2.248v-10c0-1.241,1.009-2.25,2.25-2.25h5c0.343,0,0.664,0.14,0.903,0.394
-	l3.137,3.135L12.778,5.06C12.924,5.27,13.001,5.507,13,5.75v7.998c0,1.24-1.01,2.25-2.25,2.25H3.75L3.75,15.998z M3.751,2.999
-	c-0.414,0-0.75,0.336-0.75,0.75V13.75c0,0.412,0.336,0.75,0.75,0.75h7c0.413,0,0.75-0.338,0.75-0.75V6.999h-1.75
-	c-1.24,0-2.25-1.009-2.25-2.249V2.999H3.751z"/>
-<path d="M12.508,5.118l0.009-0.009l-0.043-0.044c-0.013-0.012-0.022-0.024-0.037-0.036l-0.686-0.686l-1.593-1.594l0,0L9.472,2.065
-	C9.29,1.873,9.036,1.75,8.75,1.75h-1h-4c-1.101,0-2,0.9-2,2v10c0,1.102,0.899,1.998,2,1.998h7c1.101,0,2-0.896,2-1.998v-7v-1
-	C12.751,5.508,12.653,5.291,12.508,5.118z M11.751,13.75c0,0.553-0.449,1-1,1h-7c-0.551,0-1-0.447-1-1V3.749c0-0.551,0.449-1,1-1h4
-	V3.75v1c0,1.1,0.9,1.999,2,1.999h2V13.75z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/newFile_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/newFile_white_16px.svg
deleted file mode 100644
index 55a6697a9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/newFile_white_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-2.5 -1 16 16" enable-background="new -2.5 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M10.707,3.294c-0.475-0.391-3.247-2.411-4-3C6.489,0.123,6.256,0,6,0H2.5C0.5,0,0,1.948,0,2.5v9
-	c0,2,1.947,2.5,2.5,2.5h6c2,0,2.5-1.946,2.5-2.5V4C11,3.744,10.92,3.47,10.707,3.294 M7.5,13h-4c-2,0-2.5-0.5-2.5-2.5v-7
-	C1,1.5,1.5,1,3.5,1H5v3c0,0.554,0.447,1,1,1h4v5.5C10,12.5,9.5,13,7.5,13"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/newStatus_blue_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/newStatus_blue_16px.svg
deleted file mode 100644
index b273bf442..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/newStatus_blue_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1 16 16" enable-background="new -1 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#00A9D4" d="M4.324,13.952c-0.206-0.078-0.365-0.248-0.432-0.458l-0.771-2.413l-2.449-0.647
-	c-0.215-0.054-0.389-0.206-0.479-0.408C0.104,9.824,0.111,9.592,0.211,9.396l1.16-2.254L0.099,4.951
-	c-0.111-0.191-0.13-0.422-0.05-0.628c0.079-0.206,0.248-0.365,0.458-0.432L2.92,3.117l0.649-2.45
-	c0.058-0.213,0.208-0.389,0.409-0.479C4.179,0.098,4.411,0.1,4.607,0.206l2.252,1.16l2.19-1.276c0.381-0.222,0.926-0.012,1.06,0.408
-	l0.771,2.413l2.45,0.648c0.214,0.053,0.389,0.207,0.479,0.408c0.09,0.202,0.082,0.433-0.018,0.629L12.629,6.85l1.272,2.191
-	c0.11,0.19,0.129,0.422,0.051,0.627c-0.08,0.207-0.248,0.365-0.459,0.433l-2.412,0.774l-0.65,2.449
-	c-0.057,0.213-0.207,0.391-0.408,0.479c-0.201,0.091-0.435,0.087-0.629-0.018l-2.253-1.158l-2.19,1.274
-	C4.761,14.012,4.53,14.031,4.324,13.952"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/newStatus_green_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/newStatus_green_16px.svg
deleted file mode 100644
index f1ac0a574..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/newStatus_green_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1 16 16" enable-background="new -1 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#89BA17" d="M4.324,13.952c-0.206-0.078-0.365-0.248-0.432-0.458l-0.771-2.413l-2.449-0.647
-	c-0.215-0.054-0.389-0.206-0.479-0.408C0.104,9.824,0.111,9.592,0.211,9.396l1.16-2.254L0.099,4.951
-	c-0.111-0.191-0.13-0.422-0.05-0.628c0.079-0.206,0.248-0.365,0.458-0.432L2.92,3.117l0.649-2.45
-	c0.058-0.213,0.208-0.389,0.409-0.479C4.179,0.098,4.411,0.1,4.607,0.206l2.252,1.16l2.19-1.276c0.381-0.222,0.926-0.012,1.06,0.408
-	l0.771,2.413l2.45,0.648c0.214,0.053,0.389,0.207,0.479,0.408c0.09,0.202,0.082,0.433-0.018,0.629L12.629,6.85l1.272,2.191
-	c0.11,0.19,0.129,0.422,0.051,0.627c-0.08,0.207-0.248,0.365-0.459,0.433l-2.412,0.774l-0.65,2.449
-	c-0.057,0.213-0.207,0.391-0.408,0.479c-0.201,0.091-0.435,0.087-0.629-0.018l-2.253-1.158l-2.19,1.274
-	C4.761,14.012,4.53,14.031,4.324,13.952"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/note_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/note_black_16px.svg
deleted file mode 100644
index e9bdf82a6..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/note_black_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 12 13.5" style="enable-background:new 0 0 12 13.5;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#1D1D1B;}
-</style>
-<title>note</title>
-<path class="st0" d="M7.1,6.7c1-1,1.9-1.9,3.2-3.2c-0.2-0.4-0.4-0.7-0.7-1C9.2,2.2,8.9,2,8.5,1.8C7.2,3,6.3,4,5.3,4.9
-	c0.4,0.2,0.7,0.5,1,0.8C6.6,6,6.9,6.3,7.1,6.7"/>
-<path class="st0" d="M5.4,6.6c-0.3-0.3-0.6-0.5-1-0.7L4.2,6.1C4.1,6.2,2.6,8.4,3.1,8.9s2.7-1,2.8-1.1l0.2-0.2
-	C5.9,7.2,5.7,6.9,5.4,6.6"/>
-<path class="st0" d="M10.4,1.6c0.3,0.3,0.5,0.6,0.7,1l0.1-0.1c0.5-0.5,1.3-1.3,0.4-2.1S10,0.3,9.5,0.8L9.4,0.9
-	C9.8,1.1,10.1,1.3,10.4,1.6"/>
-<path class="st0" d="M10,5.5v6c0,0.6-0.4,1-1,1H2c-0.6,0-1-0.4-1-1v-9c0-0.6,0.4-1,1-1h5v-1H2c-1.1,0-2,0.9-2,2v9c0,1.1,0.9,2,2,2h7
-	c1.1,0,2-0.9,2-2v-6H10z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/note_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/note_white_16px.svg
deleted file mode 100644
index b6481a13e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/note_white_16px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13.52"><defs><style>.cls-1{fill:#fff;}</style></defs><title>noteWhite</title><path class="cls-1" d="M7.06,6.66l3.18-3.17a3.76,3.76,0,0,0-.72-1,3.72,3.72,0,0,0-1-.72C7.21,3.05,6.31,4,5.34,4.94a4.83,4.83,0,0,1,1,.75,4.7,4.7,0,0,1,.75,1" transform="translate(0 0.02)"/><path class="cls-1" d="M5.38,6.62a3.71,3.71,0,0,0-1-.71l-.16.16c-.16.16-1.61,2.35-1.13,2.83s2.68-1,2.84-1.12l.16-.16a3.68,3.68,0,0,0-.71-1" transform="translate(0 0.02)"/><path class="cls-1" d="M10.4,1.6a4.76,4.76,0,0,1,.74,1l.06-.1c.53-.54,1.27-1.27.41-2.13S10,.28,9.48.8L9.42.86a4.75,4.75,0,0,1,1,.74" transform="translate(0 0.02)"/><path class="cls-1" d="M10,5.5v6a1,1,0,0,1-1,1H2a1,1,0,0,1-1-1v-9a1,1,0,0,1,1-1H7V.5H2a2,2,0,0,0-2,2v9a2,2,0,0,0,2,2H9a2,2,0,0,0,2-2v-6Z" transform="translate(0 0.02)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/obsolete_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/obsolete_16px.svg
deleted file mode 100644
index b096a5a3e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/obsolete_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1 16 16" enable-background="new -1 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<g>
-	<path fill="#F6B966" d="M14,12c0,1.1-0.9,2-2,2H2c-1.1,0-2-0.9-2-2V2c0-1.1,0.9-2,2-2h10c1.1,0,2,0.9,2,2V12z"/>
-</g>
-<path fill="#FFFFFF" d="M3.5,11.699c-0.243,0-0.487-0.088-0.679-0.266c-0.405-0.376-0.43-1.008-0.055-1.414l6.662-7.199
-	c0.375-0.406,1.008-0.431,1.413-0.055c0.406,0.375,0.431,1.008,0.056,1.413l-6.663,7.2C4.037,11.592,3.769,11.699,3.5,11.699z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/pause_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/pause_black_16px.svg
deleted file mode 100644
index 21f736478..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/pause_black_16px.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<path d="M6,12c0,1.1-0.9,2-2,2l0,0c-1.1,0-2-0.9-2-2V4c0-1.1,0.9-2,2-2l0,0c1.1,0,2,0.9,2,2V12z"/>
-</g>
-<g>
-	<path d="M14,12c0,1.1-0.9,2-2,2l0,0c-1.1,0-2-0.9-2-2V4c0-1.1,0.9-2,2-2l0,0c1.1,0,2,0.9,2,2V12z"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/play_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/play_black_16px.svg
deleted file mode 100644
index 88338e960..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/play_black_16px.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path d="M13,8.01c0.004-0.559-0.336-1.042-0.836-1.302l0.003-0.005c0,0-6.602-4.468-6.667-4.501C4.703,1.787,3.684,2.033,3.224,2.75
-	C3.072,2.987,3.007,3.245,3.007,3.5H3v9C3,13.328,3.746,14,4.667,14c0.3,0,0.831-0.207,0.831-0.207
-	C5.551,13.766,12.167,9.3,12.167,9.3l-0.003-0.005C12.659,9.037,12.996,8.562,13,8.01z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/plus_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/plus_black_16px.svg
deleted file mode 100644
index cd22ae9fa..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/plus_black_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 1701.971 16 16" enable-background="new 13 1701.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M25,1708.971h-3v-3c0-0.55-0.45-1-1-1s-1,0.45-1,1v3h-3c-0.55,0-1,0.45-1,0.999s0.45,0.999,1,0.999h3v3c0,0.55,0.45,1,1,1
-	s1-0.45,1-1v-3h3c0.55,0,1-0.45,1-0.999S25.55,1708.971,25,1708.971z"/>
-<rect x="13" y="1701.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/print_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/print_black_16px.svg
deleted file mode 100644
index 59ed0fe59..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/print_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 805.971 16 16" enable-background="new 13 805.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M27,810.97h-1v2H16v-2h-1c-0.553,0-1,0.447-1,1v6c0,0.553,0.447,1,1,1h1v-3h10v3h1c0.553,0,1-0.447,1-1v-6
-	C28,811.418,27.553,810.97,27,810.97z"/>
-<polyline points="25,816.97 25,819.97 17,819.97 17,816.97 25,816.97 "/>
-<polyline points="25,806.97 25,811.97 17,811.97 17,806.97 25,806.97 "/>
-<rect x="13" y="805.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/print_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/print_white_16px.svg
deleted file mode 100644
index 5b15cc09e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/print_white_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1 16 16" enable-background="new -1 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M12,3.999h-1v2H2v-2H1c-0.553,0-1,0.447-1,1v6c0,0.555,0.447,1,1,1h1v-3h9v3h1c0.553,0,1-0.445,1-1v-6
-	C13,4.446,12.553,3.999,12,3.999"/>
-<rect x="3" y="10" fill="#FFFFFF" width="7" height="3"/>
-<rect x="3" fill="#FFFFFF" width="7" height="5"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/refresh_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/refresh_black_16px.svg
deleted file mode 100644
index 565755dc6..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/refresh_black_16px.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 229.971 16 16" enable-background="new 13 229.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M28.707,231.263c-0.393-0.391-1.023-0.391-1.414,0l-1.485,1.473c-1.302-1.095-2.973-1.766-4.808-1.766
-	c-3.626,0-6.639,2.579-7.335,6h2.07c0.658-2.301,2.265-4,5.265-4c2,0,2.45,0.444,3.384,1.178l-1.101,1.092
-	c-0.391,0.393-0.391,1.023,0,1.415c0.197,0.196,0.458,0.294,0.717,0.291l3.977,0.024c0.555-0.002,1-0.447,1-1l0.023-4
-	C29,231.714,28.902,231.458,28.707,231.263z"/>
-<path d="M13.293,244.677c0.393,0.391,1.023,0.391,1.414,0l1.485-1.473c1.302,1.095,2.973,1.766,4.808,1.766
-	c3.626,0,6.639-2.579,7.335-6h-2.07c-0.658,2.301-2.265,4-5.265,4c-2,0-2.45-0.444-3.384-1.178l1.101-1.091
-	c0.391-0.393,0.391-1.024,0-1.415c-0.197-0.196-0.458-0.294-0.717-0.291l-3.977-0.024c-0.555,0.002-1,0.447-1,1l-0.023,4
-	C13,244.226,13.098,244.482,13.293,244.677z"/>
-<rect x="13" y="229.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/refresh_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/refresh_white_16px.svg
deleted file mode 100644
index 4b8b4d198..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/refresh_white_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 -0.5 16 16" enable-background="new 0 -0.5 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M8,2c2.113,0,3.948,1.199,4.869,2.951l1.625-1.19C13.199,1.516,10.777,0,8,0
-	C4.195,0,1.061,2.837,0.573,6.509h2.02C3.059,3.943,5.305,2,8,2"/>
-<path fill="#FFFFFF" d="M13.407,8.485C12.939,11.049,10.695,13,8,13c-2.166,0-4.038-1.261-4.934-3.085L1.389,11.04
-	C2.652,13.397,5.139,15,8,15c3.805,0,6.939-2.843,7.427-6.515H13.407z"/>
-<path fill="#FFFFFF" d="M5,8.525L1.023,8.501c-0.555,0.001-1,0.447-1,0.999L0,13.501c0,0.254,0.098,0.511,0.293,0.707
-	c0.393,0.391,1.023,0.391,1.414,0l4.01-3.977c0.391-0.394,0.391-1.024,0-1.415C5.52,8.619,5.259,8.522,5,8.525"/>
-<path fill="#FFFFFF" d="M11,6.476L14.977,6.5c0.555-0.001,1-0.447,1-0.999L16,1.5c0-0.256-0.098-0.513-0.293-0.707
-	c-0.393-0.391-1.023-0.391-1.414,0l-4.01,3.977c-0.391,0.392-0.391,1.024,0,1.416C10.48,6.382,10.741,6.479,11,6.476"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/remove.svg b/client/client-editor/src/main/resources/webapp/resources/16px/remove.svg
deleted file mode 100644
index d3d8bb04e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/remove.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 13.3"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#1d1d1b;}</style></defs><title>remove</title><rect class="cls-1" x="7.9" y="7.1" width="6" height="5.9"/><path class="cls-2" d="M11.91,10.31l1.6-1.67a.69.69,0,0,0,0-1.07.62.62,0,0,0-1,0l-1.6,1.67L9.29,7.57a.62.62,0,0,0-1,0,.69.69,0,0,0,0,1.07l1.6,1.67L8.26,12a.69.69,0,0,0,0,1.07.85.85,0,0,0,.57.24c.23,0,.34-.12.57-.24L11,11.39l1.6,1.67a.85.85,0,0,0,.57.24c.23,0,.34-.12.57-.24a.69.69,0,0,0,0-1.07Z"/><path class="cls-2" d="M12.49,1.77a2.17,2.17,0,0,0-.61-.09H11c0-1-1-2-3.11-2H3.09A2.72,2.72,0,0,0,0,2.68V10a1,1,0,0,0,1,1H7V9H3C2.64,9,2,9,2,8L3,4.06a1.2,1.2,0,0,1,1-.88h8.07a.65.65,0,0,1,.66.86h0L11,6h2l1-1.56A2.23,2.23,0,0,0,12.49,1.77Z"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/resume_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/resume_black_16px.svg
deleted file mode 100644
index 6e7f8768d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/resume_black_16px.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg2992"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs2994" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="621"
-     inkscape:window-height="665"
-     inkscape:window-x="120"
-     inkscape:window-y="120"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata2997">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       transform="translate(-0.57623764,-0.2440595)"
-       id="g3">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 6,12 c 0,1.1 -0.9,2 -2,2 l 0,0 C 2.9,14 2,13.1 2,12 V 4 C 2,2.9 2.9,2 4,2 l 0,0 c 1.1,0 2,0.9 2,2 v 8 z"
-         id="path5" />
-    </g>
-    <path
-       inkscape:connector-curvature="0"
-       d="m 15.046031,7.8559042 c 0.003,-0.559 -0.249721,-1.042 -0.621331,-1.302 l 0.0022,-0.005 c 0,0 -4.9067299,-4.4679999 -4.9550391,-4.5009999 -0.5923453,-0.415 -1.3496852,-0.169 -1.6915658,0.548 -0.1129693,0.237 -0.1612785,0.4949999 -0.1612785,0.7499999 h -0.0052 v 8.9999998 c 0,0.828 0.5544412,1.5 1.2389456,1.5 0.2229656,0 0.6176148,-0.207 0.6176148,-0.207 0.039391,-0.027 4.956526,-4.4929998 4.956526,-4.4929998 l -0.0022,-0.005 c 0.367894,-0.258 0.618358,-0.733 0.621331,-1.285 z"
-       id="path3" />
-    <g
-       id="g3028"
-       transform="translate(-0.57623764,-0.2440595)">
-      <path
-         id="path3030"
-         d="m 6,12 c 0,1.1 -0.9,2 -2,2 l 0,0 C 2.9,14 2,13.1 2,12 V 4 C 2,2.9 2.9,2 4,2 l 0,0 c 1.1,0 2,0.9 2,2 v 8 z"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/routeSwitch.svg b/client/client-editor/src/main/resources/webapp/resources/16px/routeSwitch.svg
deleted file mode 100644
index 29edc28a9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/routeSwitch.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 357.97 16 16" enable-background="new 8 357.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path d="M11.341,364.494c0.215,0.214,0.537,0.278,0.818,0.163c0.092-0.039,0.174-0.095,0.242-0.163
-	c0.139-0.138,0.22-0.327,0.22-0.53l0-1.372H18v-1.5h-5.378v-1.372c0-0.304-0.184-0.577-0.463-0.693
-	c-0.281-0.116-0.604-0.052-0.818,0.163l-2.121,2.122c-0.293,0.293-0.293,0.768,0,1.061L11.341,364.494z"/>
-<path d="M12.622,367.722c0-0.305-0.184-0.577-0.463-0.694c-0.281-0.117-0.604-0.053-0.818,0.162l-2.121,2.122
-	c-0.293,0.292-0.293,0.768,0,1.06l2.121,2.121c0.215,0.214,0.537,0.278,0.818,0.163c0.092-0.039,0.174-0.094,0.242-0.163
-	c0.139-0.138,0.22-0.327,0.22-0.53l0-1.371H18v-1.5h-5.378V367.722z"/>
-<path d="M21.781,365.312l-2.121-2.122c-0.215-0.214-0.537-0.279-0.818-0.163c-0.279,0.117-0.461,0.39-0.463,0.693l0,1.372H13v1.5
-	h5.379l0,1.371c0,0.304,0.183,0.576,0.463,0.693c0.281,0.115,0.603,0.052,0.818-0.163l2.121-2.121
-	C22.073,366.079,22.073,365.604,21.781,365.312z"/>
-<rect x="8" y="357.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/rowCollapsed_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/rowCollapsed_black_16px.svg
deleted file mode 100644
index 6878c863c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/rowCollapsed_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2437.971 16 16" enable-background="new 13 2437.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="17" y="2441.97" fill="#FFFFFF" width="7" height="7"/>
-<path d="M24.5,2440.97c-0.275,0-7.725,0-8,0s-0.5,0.225-0.5,0.5s0,7.725,0,8s0.225,0.499,0.5,0.499c0.22,0,7.78,0,8,0
-	c0.275,0,0.5-0.223,0.5-0.499s0-7.725,0-8S24.775,2440.97,24.5,2440.97z M24,2448.97h-7v-7.001h7V2448.97z"/>
-<line fill="none" stroke="#000000" stroke-miterlimit="10" x1="18" y1="2445.47" x2="23" y2="2445.47"/>
-<line fill="none" stroke="#000000" stroke-miterlimit="10" x1="20.5" y1="2447.97" x2="20.5" y2="2442.971"/>
-<rect x="13" y="2437.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/rowExpanded_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/rowExpanded_black_16px.svg
deleted file mode 100644
index 5e3e46a66..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/rowExpanded_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2405.971 16 16" enable-background="new 13 2405.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="17" y="2409.97" fill="#FFFFFF" width="7" height="7"/>
-<path d="M24.5,2408.971c-0.275,0-7.725,0-8,0s-0.5,0.225-0.5,0.5s0,7.725,0,8s0.225,0.499,0.5,0.499c0.22,0,7.78,0,8,0
-	c0.275,0,0.5-0.223,0.5-0.499s0-7.725,0-8S24.775,2408.971,24.5,2408.971z M24,2416.971h-7v-7.001h7V2416.971z"/>
-<line fill="none" stroke="#000000" stroke-miterlimit="10" x1="18" y1="2413.471" x2="23" y2="2413.471"/>
-<rect x="13" y="2405.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/rowView_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/rowView_black_16px.svg
deleted file mode 100644
index eb7541ecc..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/rowView_black_16px.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2949.971 16 16" enable-background="new 13 2949.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M14.326,2959.089l1.508,0.801c0.099,0.053,0.208,0.08,0.319,0.08c0.063,0,0.126-0.01,0.188-0.027
-	c0.169-0.045,0.311-0.156,0.391-0.304l1.557-2.864c0.16-0.297,0.03-0.656-0.289-0.805c-0.318-0.149-0.707-0.027-0.866,0.268
-	l-1.252,2.297l-0.915-0.488c-0.309-0.164-0.705-0.063-0.882,0.223C13.909,2958.558,14.016,2958.923,14.326,2959.089z"/>
-<g>
-	<path d="M21,2959.97c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h6c0.55,0,1,0.45,1,1v2c0,0.55-0.45,1-1,1H21z"/>
-</g>
-<g>
-	<path d="M21,2964.97c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h6c0.55,0,1,0.45,1,1v2c0,0.55-0.45,1-1,1H21z"/>
-</g>
-<g>
-	<path d="M15,2964.97c-0.55,0-1-0.45-1-1v-2c0-0.55,0.45-1,1-1h2c0.55,0,1,0.45,1,1v2c0,0.55-0.45,1-1,1H15z"/>
-</g>
-<g>
-	<path d="M14,2951.97c0-0.55,0.45-1,1-1h12c0.55,0,1,0.45,1,1v2c0,0.55-0.45,1-1,1H15c-0.55,0-1-0.45-1-1V2951.97z"/>
-</g>
-<rect x="13" y="2949.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/rowView_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/rowView_white.svg
deleted file mode 100644
index 9f12b6f5e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/rowView_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_rowView_white</title><path class="cls-1" d="M1.33,9.12l1.51.8a.68.68,0,0,0,.32.08l.19,0a.63.63,0,0,0,.39-.3L5.29,6.81A.58.58,0,0,0,5,6a.67.67,0,0,0-.87.27L2.88,8.57,2,8.08a.68.68,0,0,0-.88.22A.58.58,0,0,0,1.33,9.12Z" transform="translate(-1 -1)"/><path class="cls-1" d="M8,10A1,1,0,0,1,7,9V7A1,1,0,0,1,8,6h6a1,1,0,0,1,1,1V9a1,1,0,0,1-1,1Z" transform="translate(-1 -1)"/><path class="cls-1" d="M8,15a1,1,0,0,1-1-1V12a1,1,0,0,1,1-1h6a1,1,0,0,1,1,1v2a1,1,0,0,1-1,1Z" transform="translate(-1 -1)"/><path class="cls-1" d="M2,15a1,1,0,0,1-1-1V12a1,1,0,0,1,1-1H4a1,1,0,0,1,1,1v2a1,1,0,0,1-1,1Z" transform="translate(-1 -1)"/><path class="cls-1" d="M1,2A1,1,0,0,1,2,1H14a1,1,0,0,1,1,1V4a1,1,0,0,1-1,1H2A1,1,0,0,1,1,4Z" transform="translate(-1 -1)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/rxi_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/rxi_black_16px.svg
deleted file mode 100644
index 0d6568506..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/rxi_black_16px.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 261.97 16 16" enable-background="new 8 261.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path d="M18.77,264.311l-2.216-2.121c-0.153-0.146-0.353-0.22-0.554-0.22s-0.401,0.073-0.554,0.22l-2.216,2.121
-	c-0.225,0.215-0.292,0.379-0.17,0.659c0.122,0.28,0.407,0.4,0.725,0.4H15.4v2.6H16h0.6v-2.6h1.616c0.317,0,0.602-0.12,0.725-0.4
-	C19.062,264.69,18.995,264.526,18.77,264.311z"/>
-<path d="M13.23,275.629l2.216,2.121c0.153,0.146,0.354,0.22,0.554,0.22s0.401-0.073,0.554-0.22l2.216-2.121
-	c0.225-0.215,0.292-0.379,0.17-0.659c-0.122-0.28-0.407-0.4-0.725-0.4H16.6v-2.6H16h-0.6v2.6h-1.616c-0.318,0-0.602,0.12-0.725,0.4
-	C12.938,275.25,13.006,275.414,13.23,275.629z"/>
-<path d="M10.341,267.2l-2.121,2.216C8.073,269.569,8,269.77,8,269.97s0.073,0.401,0.22,0.554l2.121,2.216
-	c0.215,0.225,0.379,0.292,0.659,0.17c0.28-0.122,0.4-0.407,0.4-0.725v-1.616H14v-0.6v-0.6h-2.6v-1.616c0-0.317-0.12-0.602-0.4-0.725
-	C10.72,266.909,10.556,266.976,10.341,267.2z"/>
-<path d="M21.659,272.74l2.121-2.216c0.146-0.153,0.22-0.354,0.22-0.554s-0.073-0.401-0.22-0.554l-2.121-2.216
-	c-0.215-0.225-0.379-0.292-0.659-0.17c-0.28,0.122-0.4,0.407-0.4,0.725v1.616H18v0.6v0.6h2.6v1.616c0,0.317,0.12,0.602,0.4,0.725
-	C21.28,273.032,21.444,272.965,21.659,272.74z"/>
-<rect x="8" y="261.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/save_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/save_black_16px.svg
deleted file mode 100644
index a0d012248..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/save_black_16px.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 165.971 16 16" enable-background="new 13 165.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M25.875,166.971c0,0-7.854-0.001-8.484-0.001c-1.105,0-2.391,1.416-2.391,2.521c0,0.402,0,9.413,0,9.679
-	c0,1.104,0.791,1.801,1.896,1.801c0.129,0,7.777,0,8.18,0c1.105,0,1.924-0.696,1.924-1.801c0-0.271,0-9.199,0-9.199L25.875,166.971z
-	 M25,178.766c0,0.287-0.207,0.204-0.462,0.204h-7.075c-0.255,0-0.463,0.083-0.463-0.204v-4.386c0-0.288,0.208-0.41,0.463-0.41h7.075
-	c0.255,0,0.462,0.122,0.462,0.41V178.766z M25,170.97c0,0.55-0.45,1-1,1h-2h-3h-1v-1v-1.999v-1.001h1h3h2c0.55,0,1,0.451,1,1.001
-	V170.97z"/>
-<rect x="23" y="168.97" width="1" height="2"/>
-<rect x="13" y="165.971" fill="none" width="16" height="16"/>
-<rect x="13" y="165.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/save_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/save_white.svg
deleted file mode 100644
index 704179d53..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/save_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13 14"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_save_white</title><path class="cls-1" d="M13.11,1H4.05A2.94,2.94,0,0,0,1.5,3.49V13a2,2,0,0,0,2,2h8.74a2.15,2.15,0,0,0,2.24-2V4ZM4.57,2h7.55a.55.55,0,0,1,.57.53V5.76a.55.55,0,0,1-.57.53H4.57Zm8.37,10.64a.53.53,0,0,1-.56.51H3.56A.54.54,0,0,1,3,12.63V8.31a.54.54,0,0,1,.56-.51h8.83a.53.53,0,0,1,.56.51Z" transform="translate(-1.5 -1)"/><rect class="cls-1" x="8.53" y="1.97" width="1.07" height="1.98"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/search_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/search_black_16px.svg
deleted file mode 100644
index 11414796f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/search_black_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 133.971 16 16" enable-background="new 13 133.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M27.612,146.663l-3.209-3.271c-0.117-0.119-0.256-0.203-0.399-0.271c0.461-0.781,0.744-1.679,0.744-2.65
-	c0-2.894-2.354-5.249-5.248-5.249c-2.895,0-5.249,2.355-5.249,5.249s2.354,5.249,5.249,5.249c0.983,0,1.894-0.289,2.681-0.761
-	c0.06,0.112,0.115,0.226,0.209,0.322l3.208,3.271c0.274,0.28,0.641,0.42,1.007,0.42c0.348,0,0.695-0.126,0.966-0.38
-	C28.126,148.07,28.146,147.207,27.612,146.663z M15.75,140.47c0-2.067,1.682-3.749,3.749-3.749c2.067,0,3.748,1.682,3.748,3.749
-	s-1.681,3.749-3.748,3.749C17.432,144.219,15.75,142.538,15.75,140.47z"/>
-<rect x="13" y="133.97" fill="none" width="16" height="16"/>
-<rect x="13" y="133.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/search_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/search_white_16px.svg
deleted file mode 100644
index f32eae380..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/search_white_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1.5 -1 16 16" enable-background="new -1.5 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M5.207,10.415C2.336,10.415,0,8.079,0,5.208C0,2.336,2.336,0,5.207,0c2.87,0,5.206,2.336,5.206,5.208
-	C10.413,8.079,8.077,10.415,5.207,10.415 M5.207,1.417c-2.091,0-3.791,1.701-3.791,3.791c0,2.089,1.7,3.79,3.791,3.79
-	c2.09,0,3.789-1.701,3.789-3.79C8.996,3.118,7.297,1.417,5.207,1.417"/>
-<path fill="#FFFFFF" d="M11.543,14.382c-0.402,0-0.803-0.17-1.084-0.502l-3.092-3.655C6.861,9.627,6.937,8.733,7.533,8.227
-	c0.598-0.504,1.492-0.431,1.998,0.167l3.093,3.655c0.505,0.598,0.432,1.492-0.167,1.998C12.191,14.271,11.866,14.382,11.543,14.382"
-	/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/security_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/security_black_16px.svg
deleted file mode 100644
index df3080b40..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/security_black_16px.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2629.971 16 16" enable-background="new 13 2629.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<g>
-	<path d="M21.494,2630.993c1.718,0.371,4.516,1.226,5.386,2.122c0.394,0.833-0.045,5.226-1.889,8.3
-		c-1.018,1.697-2.195,2.557-3.499,2.557c-1.3,0-2.473-0.855-3.486-2.541c-1.843-3.068-2.281-7.464-1.887-8.301
-		C16.987,2632.23,19.779,2631.368,21.494,2630.993 M21.493,2629.971c0,0-4.733,0.973-6.141,2.516
-		c-1.21,1.325,0.67,12.484,6.141,12.484c5.471,0,7.372-11.174,6.154-12.501C26.237,2630.937,21.493,2629.971,21.493,2629.971
-		L21.493,2629.971z"/>
-</g>
-<g>
-	<path d="M21.493,2642.471c-0.546,0-1.118-0.386-1.698-1.146c-1.695-2.225-2.305-6.011-2.233-7.394
-		c0.733-0.441,2.365-1.024,3.934-1.396c1.569,0.369,3.205,0.946,3.941,1.385c0.07,1.386-0.545,5.173-2.24,7.398
-		C22.614,2642.084,22.041,2642.471,21.493,2642.471z"/>
-</g>
-<rect x="13" y="2629.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/security_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/security_white_16px.svg
deleted file mode 100644
index 3230ff359..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/security_white_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1.5 -0.5 16 16" enable-background="new -1.5 -0.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M6.331,1.023c1.673,0.372,4.384,1.224,5.225,2.111c0.39,0.842-0.078,5.405-1.916,8.442
-	C8.667,13.186,7.554,14,6.33,14C5.11,14,4,13.19,3.032,11.594c-1.837-3.031-2.305-7.6-1.913-8.444
-	C1.959,2.256,4.663,1.398,6.331,1.023 M6.33,0c0,0-4.614,0.974-5.987,2.517C-0.837,3.842,0.996,15,6.33,15s7.187-11.174,6-12.501
-	C10.956,0.966,6.33,0,6.33,0"/>
-<path fill="#FFFFFF" d="M6.33,12.5c-0.532,0-1.09-0.386-1.655-1.146C3.022,9.13,2.428,5.344,2.498,3.96
-	c0.715-0.441,2.306-1.023,3.835-1.396c1.53,0.369,3.125,0.947,3.843,1.385c0.068,1.387-0.532,5.173-2.184,7.399
-	C7.424,12.112,6.864,12.5,6.33,12.5"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/settings_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/settings_black_16px.svg
deleted file mode 100644
index c347888e9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/settings_black_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 101.971 16 16" enable-background="new 13 101.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M28,110.97v-2h-2.101c-0.13-0.638-0.383-1.229-0.73-1.754l1.488-1.488l-1.414-1.414l-1.488,1.488
-	c-0.524-0.347-1.117-0.601-1.755-0.731v-2.101h-2v2.101c-0.638,0.129-1.23,0.383-1.754,0.731l-1.488-1.488l-1.414,1.414l1.488,1.488
-	c-0.347,0.524-0.601,1.116-0.731,1.754H14v2h2.101c0.13,0.638,0.384,1.23,0.731,1.755l-1.488,1.488l1.414,1.414l1.488-1.488
-	c0.524,0.347,1.116,0.601,1.754,0.73v2.101h2v-2.101c0.638-0.129,1.23-0.383,1.754-0.731l1.489,1.489l1.414-1.414l-1.489-1.489
-	c0.347-0.524,0.601-1.116,0.731-1.754H28z M21,112.47c-1.381,0-2.5-1.119-2.5-2.5s1.119-2.5,2.5-2.5s2.5,1.119,2.5,2.5
-	S22.381,112.47,21,112.47z"/>
-<rect x="13" y="101.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/settings_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/settings_white_16px.svg
deleted file mode 100644
index e54f3acca..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/settings_white_16px.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1 16 16" enable-background="new -1 -1 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M11.947,8.298c0.037-0.141,0.163-0.237,0.308-0.237H14V5.936h-1.745c-0.145,0-0.271-0.095-0.308-0.234
-	c-0.118-0.452-0.297-0.885-0.53-1.284c-0.072-0.123-0.053-0.279,0.049-0.384L12.699,2.8L11.2,1.3L9.966,2.532
-	c-0.104,0.104-0.262,0.12-0.385,0.049c-0.398-0.232-0.832-0.41-1.284-0.529C8.159,2.017,8.061,1.89,8.061,1.745V0H5.938v1.745
-	c0,0.145-0.095,0.272-0.235,0.307C5.25,2.171,4.82,2.349,4.418,2.581C4.295,2.652,4.137,2.636,4.035,2.532L2.801,1.3L1.3,2.8
-	l1.235,1.233c0.102,0.105,0.123,0.261,0.049,0.384C2.35,4.816,2.174,5.249,2.053,5.701c-0.038,0.14-0.161,0.234-0.309,0.234H0v2.125
-	h1.744c0.147,0,0.271,0.097,0.309,0.237C2.174,8.749,2.35,9.182,2.584,9.579c0.074,0.125,0.053,0.28-0.049,0.387L1.3,11.197
-	l1.501,1.502l1.234-1.233c0.102-0.104,0.26-0.122,0.383-0.05c0.402,0.232,0.832,0.41,1.284,0.53
-	c0.141,0.036,0.235,0.161,0.235,0.307v1.745h2.123v-1.745c0-0.146,0.099-0.271,0.236-0.307c0.452-0.12,0.886-0.298,1.284-0.53
-	c0.123-0.072,0.281-0.055,0.385,0.05l1.234,1.233l1.499-1.502l-1.233-1.231c-0.102-0.106-0.121-0.262-0.049-0.387
-	C11.65,9.182,11.829,8.749,11.947,8.298 M7,9.579C5.575,9.579,4.419,8.425,4.419,7c0-1.427,1.156-2.583,2.581-2.583
-	c1.427,0,2.582,1.156,2.582,2.583C9.582,8.425,8.427,9.579,7,9.579"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/share_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/share_black_16px.svg
deleted file mode 100644
index 28700975b..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/share_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 69.971 16 16" enable-background="new 13 69.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<polyline fill="none" stroke="#333333" stroke-width="1.4173" stroke-miterlimit="10" points="25.5,72.971 16,77.971 25.5,82.971 
-	"/>
-<path d="M28.9,72.97c0,1.65-1.328,3-2.95,3c-1.623,0-2.95-1.35-2.95-3s1.328-3,2.95-3C27.572,69.97,28.9,71.32,28.9,72.97z"/>
-<path d="M28.9,82.97c0,1.65-1.328,3-2.95,3c-1.623,0-2.95-1.35-2.95-3s1.328-3,2.95-3C27.572,79.97,28.9,81.32,28.9,82.97z"/>
-<path d="M19,77.97c0,1.65-1.35,3-3,3s-3-1.35-3-3s1.35-3,3-3S19,76.32,19,77.97z"/>
-<rect x="13" y="69.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/share_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/share_white.svg
deleted file mode 100644
index 58ca3a1bd..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/share_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_share_white</title><path class="cls-1" d="M13,0a3,3,0,1,1-3,3,3,3,0,0,1,3-3"/><path class="cls-1" d="M13,10a3,3,0,1,1-3,3,3,3,0,0,1,3-3"/><path class="cls-1" d="M3,5A3,3,0,1,1,0,8,3,3,0,0,1,3,5"/><polygon class="cls-1" points="13.12 14.15 2.5 8 13.12 1.85 13.88 3.15 5.5 8 13.88 12.85 13.12 14.15"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/simple_green_tick.svg b/client/client-editor/src/main/resources/webapp/resources/16px/simple_green_tick.svg
deleted file mode 100644
index 80d291ca9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/simple_green_tick.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-3 -4 16 16" enable-background="new -3 -4 16 16" xml:space="preserve">
-<defs>
-</defs>
-<polyline fill="none" stroke="#86BC25" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
-	1,4 4,7 9,1 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/simple_tick.svg b/client/client-editor/src/main/resources/webapp/resources/16px/simple_tick.svg
deleted file mode 100644
index 06c6967ad..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/simple_tick.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-3 -4 16 16" enable-background="new -3 -4 16 16" xml:space="preserve">
-<defs>
-</defs>
-<polyline fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
-	1,4 4,7 9,1 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/siteManager_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/siteManager_black_16px.svg
deleted file mode 100644
index 2b30f35c2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/siteManager_black_16px.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<rect x="8" y="165.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<line fill="none" stroke="#000" stroke-width="1.7008" stroke-linecap="round" stroke-miterlimit="10" x1="8" y1="1" x2="8" y2="4.5"/>
-<line fill="none" stroke="#000" stroke-width="1.7008" stroke-linecap="round" stroke-miterlimit="10" x1="1" y1="8" x2="4.5" y2="8"/>
-<path fill="#000" d="M5.955,12.398C4.291,11.628,3.134,9.952,3.134,8c0-2.683,2.183-4.866,4.866-4.866
-	c1.959,0,3.641,1.166,4.407,2.839c1.231-0.003,0,0,1.231-0.003C12.811,3.655,10.602,2,8,2C4.687,2,2,4.687,2,8
-	c0,2.592,1.645,4.796,3.946,5.632C5.955,12.398,5.992,12.416,5.955,12.398z"/>
-<g>
-	<g>
-		<path fill="#000" d="M14.654,12.264c0.022-0.094,0.106-0.156,0.201-0.156H16v-1.394h-1.145c-0.095,0-0.179-0.063-0.201-0.155
-			c-0.077-0.295-0.194-0.58-0.348-0.843c-0.048-0.079-0.035-0.183,0.03-0.25l0.81-0.812l-0.983-0.981l-0.81,0.808
-			c-0.066,0.068-0.172,0.08-0.252,0.033c-0.263-0.153-0.547-0.27-0.841-0.347c-0.092-0.022-0.155-0.108-0.155-0.201V6.82h-1.393
-			v1.145c0,0.093-0.062,0.179-0.156,0.201C10.262,8.244,9.98,8.36,9.715,8.514c-0.08,0.047-0.184,0.035-0.25-0.033L8.656,7.673
-			L7.672,8.654l0.81,0.812c0.067,0.067,0.083,0.171,0.032,0.25c-0.153,0.263-0.269,0.548-0.349,0.843
-			c-0.024,0.092-0.106,0.155-0.203,0.155H6.819v1.394h1.143c0.097,0,0.179,0.062,0.203,0.156c0.08,0.295,0.195,0.576,0.349,0.842
-			c0.051,0.078,0.035,0.183-0.032,0.25l-0.81,0.809l0.984,0.984l0.809-0.81c0.066-0.067,0.17-0.079,0.25-0.032
-			c0.266,0.153,0.547,0.271,0.844,0.349c0.092,0.022,0.155,0.106,0.155,0.2V16h1.392v-1.145c0-0.095,0.064-0.179,0.156-0.201
-			c0.295-0.077,0.578-0.194,0.842-0.348c0.08-0.048,0.185-0.035,0.252,0.031l0.809,0.811l0.984-0.985l-0.811-0.808
-			c-0.066-0.068-0.078-0.172-0.031-0.252C14.46,12.84,14.577,12.559,14.654,12.264z M11.408,13.104
-			c-0.934,0-1.692-0.759-1.692-1.692c0-0.937,0.759-1.695,1.692-1.695c0.938,0,1.695,0.759,1.695,1.695
-			C13.104,12.346,12.346,13.104,11.408,13.104z"/>
-	</g>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/site_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/site_black_16px.svg
deleted file mode 100644
index 83dc8e5ef..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/site_black_16px.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 133.97 16 16" enable-background="new 8 133.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<g>
-	<path d="M16,137.104c2.683,0,4.866,2.183,4.866,4.866s-2.183,4.866-4.866,4.866s-4.866-2.183-4.866-4.866
-		S13.317,137.104,16,137.104 M16,135.97c-3.313,0-6,2.687-6,6s2.687,6,6,6s6-2.687,6-6S19.313,135.97,16,135.97L16,135.97z"/>
-</g>
-<line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.7008" stroke-linecap="round" stroke-miterlimit="10" x1="16" y1="134.97" x2="16" y2="138.47"/>
-<line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.7008" stroke-linecap="round" stroke-miterlimit="10" x1="16" y1="145.47" x2="16" y2="148.97"/>
-<line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.7008" stroke-linecap="round" stroke-miterlimit="10" x1="9" y1="141.97" x2="12.5" y2="141.97"/>
-<line fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-width="1.7008" stroke-linecap="round" stroke-miterlimit="10" x1="19.5" y1="141.97" x2="23" y2="141.97"/>
-<circle fill-rule="evenodd" clip-rule="evenodd" cx="16" cy="141.97" r="1.188"/>
-<rect x="8" y="133.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/sort.svg b/client/client-editor/src/main/resources/webapp/resources/16px/sort.svg
deleted file mode 100644
index 5064ee88e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/sort.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12"><defs><style>.cls-1{fill:#333;}</style></defs><path class="cls-1" d="M13.77,4.6,11.55,2.24a.75.75,0,0,0-1.11,0L8.23,4.6a.88.88,0,0,0-.17.91.83.83,0,0,0,.17.26A.75.75,0,0,0,8.78,6H10v7h2V6h1.22a.78.78,0,0,0,.72-.5A.85.85,0,0,0,13.77,4.6Z" transform="translate(-2 -2)"/><path class="cls-1" d="M7.94,10.5a.78.78,0,0,0-.72-.5H6V4H4v6H2.78a.77.77,0,0,0-.72.5.86.86,0,0,0,.17.9l2.22,2.35a.75.75,0,0,0,1.11,0l2.22-2.35A.87.87,0,0,0,7.94,10.5Z" transform="translate(-2 -2)"/></svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/sort_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/sort_white.svg
deleted file mode 100644
index 5dc962a89..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/sort_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12"><defs><style>.cls-1{fill:#FFF;}</style></defs><path class="cls-1" d="M13.77,4.6,11.55,2.24a.75.75,0,0,0-1.11,0L8.23,4.6a.88.88,0,0,0-.17.91.83.83,0,0,0,.17.26A.75.75,0,0,0,8.78,6H10v7h2V6h1.22a.78.78,0,0,0,.72-.5A.85.85,0,0,0,13.77,4.6Z" transform="translate(-2 -2)"/><path class="cls-1" d="M7.94,10.5a.78.78,0,0,0-.72-.5H6V4H4v6H2.78a.77.77,0,0,0-.72.5.86.86,0,0,0,.17.9l2.22,2.35a.75.75,0,0,0,1.11,0l2.22-2.35A.87.87,0,0,0,7.94,10.5Z" transform="translate(-2 -2)"/></svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/star_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/star_black_16px.svg
deleted file mode 100644
index 5262bd00d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/star_black_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 37.971 16 16" enable-background="new 13 37.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<polygon points="23.876,47.063 28,43.97 22.764,43.97 20.966,38.97 19.192,43.97 14,43.97 18.101,47.046 16,52.97 21,49.22
-	26,52.97 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/star_outline_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/star_outline_black_16px.svg
deleted file mode 100644
index 72d96969f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/star_outline_black_16px.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path fill="#333333" d="M15.5,5.8c-0.1-0.2-0.3-0.3-0.5-0.3h-4.9L8.4,0.8C8.4,0.6,8.2,0.5,8,0.5c-0.2,0-0.4,0.1-0.5,0.3L5.8,5.5H1
-	c-0.2,0-0.4,0.1-0.5,0.3C0.5,6,0.5,6.3,0.7,6.4l3.8,2.9l-2,5.6c-0.1,0.2,0,0.4,0.2,0.6c0.2,0.1,0.4,0.1,0.6,0L8,11.9l4.7,3.5
-	c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.3-0.1c0.2-0.1,0.2-0.4,0.2-0.6l-2-5.6l3.8-2.9C15.5,6.3,15.5,6,15.5,5.8z M10.3,8.9l1.7,4.7
-	l-4-3l-4,3l1.7-4.7L2.5,6.5h4l1.4-4l1.4,4h4.1L10.3,8.9z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/star_outline_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/star_outline_white_16px.svg
deleted file mode 100644
index 28c821169..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/star_outline_white_16px.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path fill="#FFFFFF" d="M15.5,5.8c-0.1-0.2-0.3-0.3-0.5-0.3h-4.9L8.4,0.8C8.4,0.6,8.2,0.5,8,0.5c-0.2,0-0.4,0.1-0.5,0.3L5.8,5.5H1
-	c-0.2,0-0.4,0.1-0.5,0.3C0.5,6,0.5,6.3,0.7,6.4l3.8,2.9l-2,5.6c-0.1,0.2,0,0.4,0.2,0.6c0.2,0.1,0.4,0.1,0.6,0L8,11.9l4.7,3.5
-	c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.3-0.1c0.2-0.1,0.2-0.4,0.2-0.6l-2-5.6l3.8-2.9C15.5,6.3,15.5,6,15.5,5.8z M10.3,8.9l1.7,4.7
-	l-4-3l-4,3l1.7-4.7L2.5,6.5h4l1.4-4l1.4,4h4.1L10.3,8.9z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/star_outline_yellow_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/star_outline_yellow_16px.svg
deleted file mode 100644
index 9b1bb5771..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/star_outline_yellow_16px.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path fill="#FABB00" d="M15.5,5.8c-0.1-0.2-0.3-0.3-0.5-0.3h-4.9L8.4,0.8C8.4,0.6,8.2,0.5,8,0.5c-0.2,0-0.4,0.1-0.5,0.3L5.8,5.5H1
-	c-0.2,0-0.4,0.1-0.5,0.3C0.5,6,0.5,6.3,0.7,6.4l3.8,2.9l-2,5.6c-0.1,0.2,0,0.4,0.2,0.6c0.2,0.1,0.4,0.1,0.6,0L8,11.9l4.7,3.5
-	c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.3-0.1c0.2-0.1,0.2-0.4,0.2-0.6l-2-5.6l3.8-2.9C15.5,6.3,15.5,6,15.5,5.8z M10.3,8.9l1.7,4.7
-	l-4-3l-4,3l1.7-4.7L2.5,6.5h4l1.4-4l1.4,4h4.1L10.3,8.9z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/star_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/star_white_16px.svg
deleted file mode 100644
index f9739f823..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/star_white_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 37.971 16 16" enable-background="new 13 37.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<polygon fill="#FFFFFF" points="23.876,47.063 28,43.97 22.764,43.97 20.966,38.97 19.192,43.97 14,43.97 18.101,47.046 16,52.97 21,49.22
-	26,52.97 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/star_yellow_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/star_yellow_16px.svg
deleted file mode 100644
index e7fc9ab8c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/star_yellow_16px.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<polygon fill="#FABB00" points="10.876,9.093 15,6 9.764,6 7.966,1 6.192,6 1,6 5.101,9.076 3,15 8,11.25 13,15 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/stop_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/stop_black_16px.svg
deleted file mode 100644
index 7558ed549..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/stop_black_16px.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<path d="M14,11c0,1.65-1.35,3-3,3H5c-1.65,0-3-1.35-3-3V5c0-1.65,1.35-3,3-3h6c1.65,0,3,1.35,3,3V11z"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/subnetwork.svg b/client/client-editor/src/main/resources/webapp/resources/16px/subnetwork.svg
deleted file mode 100644
index c08bd5154..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/subnetwork.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1.322 -0.001 16 16"
-	 overflow="visible" enable-background="new -1.322 -0.001 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path d="M11.102,10.812l0.004-2.752c0-0.009,0.005-0.016,0.005-0.023c0-0.043-0.021-0.076-0.031-0.115
-	c-0.009-0.029-0.013-0.061-0.024-0.089c-0.025-0.056-0.057-0.099-0.098-0.143c-0.006-0.009-0.013-0.015-0.02-0.021
-	c-0.033-0.029-0.056-0.07-0.096-0.092c-0.076-0.046-0.167-0.071-0.264-0.072L7.691,7.5c0,0.001,0,0.003,0,0.003H7.127l0.004-2.317
-	C8.322,4.94,9.222,3.883,9.222,2.62C9.222,1.175,8.045,0,6.598,0C5.152,0,3.975,1.175,3.975,2.62c0,1.264,0.9,2.323,2.094,2.568
-	L6.065,7.504L2.68,7.5c-0.096,0-0.181,0.033-0.258,0.076c-0.107,0.046-0.199,0.112-0.255,0.21C2.121,7.864,2.094,7.955,2.094,8.051
-	l-0.003,2.761C0.899,11.058,0,12.115,0,13.378c0,1.445,1.177,2.621,2.624,2.621c1.447,0,2.624-1.176,2.624-2.621
-	c0-1.265-0.901-2.322-2.094-2.566l0.003-2.25l5.408,0.003c0,0,0,0,0-0.001l1.479,0.001l-0.003,2.247
-	c-1.193,0.246-2.091,1.304-2.091,2.566c0,1.445,1.177,2.621,2.623,2.621c1.447,0,2.624-1.176,2.624-2.621
-	C13.196,12.113,12.295,11.056,11.102,10.812z M5.038,2.62c0-0.859,0.698-1.557,1.56-1.557c0.86,0,1.561,0.697,1.561,1.557
-	s-0.7,1.559-1.561,1.559C5.736,4.179,5.038,3.479,5.038,2.62z M4.182,13.378c0,0.859-0.698,1.559-1.558,1.559
-	c-0.861,0-1.56-0.699-1.56-1.559s0.699-1.559,1.56-1.559C3.483,11.819,4.182,12.519,4.182,13.378z M10.572,14.937
-	c-0.861,0-1.56-0.699-1.56-1.559s0.698-1.559,1.56-1.559s1.559,0.699,1.559,1.559S11.434,14.937,10.572,14.937z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/suspend_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/suspend_black_16px.svg
deleted file mode 100644
index 5c04ead98..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/suspend_black_16px.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path d="M22.923-8.587c-3.123,3.124-3.123,8.19,0,11.313c3.124,3.125,8.191,3.125,11.313,0c3.125-3.123,3.125-8.189,0-11.313
-	C31.114-11.711,26.047-11.711,22.923-8.587 M32.581-3.931c0.553,0,1,0.447,1,1c0,0.276-0.11,0.526-0.293,0.707
-	c-0.183,0.181-0.433,0.292-0.707,0.292l-3.002,0.001V1.07c0.002,0.275-0.108,0.525-0.291,0.705
-	c-0.183,0.182-0.433,0.293-0.708,0.293c-0.553,0-0.999-0.447-1-1v-2.999h-2.999c-0.554-0.001-1-0.448-1-1c0-0.552,0.446-1,1-1h2.999
-	v-3c0-0.553,0.447-1,1-1c0.554,0,1.001,0.447,1.001,1L29.579-3.93L32.581-3.931z"/>
-<path fill="#B1B3B4" d="M35.438,17.073H21.725c-0.633,0-1.144,0.516-1.144,0.878v7.625c0,0.029,0.022,0.057,0.028,0.084
-	c0.304,4.143,3.75,7.413,7.972,7.413c4.221,0,7.668-3.271,7.971-7.413c0.007-0.029,0.029-0.055,0.029-0.086v-7.646
-	C36.581,17.564,36.066,17.073,35.438,17.073z"/>
-<g>
-	<g>
-		<ellipse fill="#B1B3B4" cx="40.287" cy="5.099" rx="3.705" ry="3.87"/>
-	</g>
-	<rect x="46.186" y="-2.93" fill="#B1B3B4" width="5.844" height="6.104"/>
-	<path fill="#B1B3B4" d="M52.029,3.682h-5.846c-0.27,0-0.484-0.227-0.484-0.51V-2.93c0-0.281,0.217-0.508,0.484-0.508h5.846
-		c0.271,0,0.488,0.227,0.488,0.508v6.104C52.518,3.455,52.3,3.682,52.029,3.682z M46.673,2.664h4.87v-5.085h-4.87V2.664z"/>
-	<path fill="#B1B3B4" d="M52.089,5.375h-5.899c-0.271,0-0.488,0.231-0.488,0.393v3.425c0,0.014,0.009,0.024,0.012,0.039
-		c0.131,1.86,1.613,3.33,3.432,3.33c1.813,0,3.297-1.47,3.428-3.33c0.002-0.017,0.013-0.025,0.013-0.039V5.758
-		C52.581,5.594,52.359,5.375,52.089,5.375z"/>
-</g>
-<g>
-	<g>
-		<path d="M37.771-18.239c0,0.825-0.676,1.5-1.5,1.5h-13c-0.826,0-1.5-0.675-1.5-1.5v-13c0-0.825,0.674-1.5,1.5-1.5h13
-			c0.824,0,1.5,0.675,1.5,1.5V-18.239z"/>
-	</g>
-	<g>
-		
-			<circle fill="none" stroke="#FFFFFF" stroke-width="0.75" stroke-linecap="round" stroke-miterlimit="10" stroke-dasharray="2.5714,2.5714" cx="29.771" cy="-24.739" r="6.67"/>
-	</g>
-	<circle fill="#FFFFFF" stroke="#FFFFFF" stroke-linecap="round" stroke-miterlimit="10" cx="29.771" cy="-24.739" r="2.325"/>
-</g>
-<g>
-	<g>
-		<path d="M68.582-18.894c0,0.825-0.676,1.5-1.5,1.5h-13c-0.826,0-1.5-0.675-1.5-1.5v-13c0-0.825,0.674-1.5,1.5-1.5h13
-			c0.824,0,1.5,0.675,1.5,1.5V-18.894z"/>
-	</g>
-	<g>
-		<g>
-			<path fill="#FFFFFF" d="M57.553-21.375c-0.182,0.184-0.479,0.184-0.662,0l-0.33-0.33c-0.184-0.183-0.184-0.48,0-0.663
-				l7.049-7.046c0.186-0.183,0.482-0.183,0.662-0.002l0.332,0.332c0.184,0.183,0.184,0.479,0,0.662L57.553-21.375z"/>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M64.604-22.366c0.186,0.182,0.186,0.48,0,0.663l-0.332,0.33c-0.184,0.182-0.479,0.182-0.662,0
-				l-7.049-7.049c-0.184-0.183-0.184-0.481,0-0.662l0.332-0.332c0.184-0.181,0.479-0.181,0.66,0L64.604-22.366z"/>
-		</g>
-	</g>
-	<g>
-		
-			<circle fill="none" stroke="#FFFFFF" stroke-width="0.75" stroke-linecap="round" stroke-miterlimit="10" cx="60.582" cy="-25.394" r="7.16"/>
-	</g>
-</g>
-<g>
-	
-		<line fill="none" stroke="#000000" stroke-width="2.2" stroke-linecap="round" stroke-miterlimit="10" x1="11.438" y1="8" x2="4.578" y2="8"/>
-</g>
-<g>
-	<g>
-		<path d="M-2.615-17.571c0,0.275-0.225,0.5-0.5,0.5H-7.5c-0.275,0-0.5-0.225-0.5-0.5v-14.243c0-0.275,0.225-0.5,0.5-0.5h4.385
-			c0.275,0,0.5,0.225,0.5,0.5V-17.571z"/>
-	</g>
-	<path d="M1.615-32.739"/>
-	<g>
-		<path d="M0.09-31.896c0-0.413,0.238-0.511,0.529-0.218l6.852,6.89c0.291,0.292,0.291,0.771,0,1.063l-6.852,6.89
-			c-0.291,0.293-0.529,0.194-0.529-0.218V-31.896z"/>
-	</g>
-</g>
-<g>
-	<circle fill="#31BADD" cx="-31.451" cy="-18.069" r="8"/>
-	<path fill="#FFFFFF" d="M-30.474-21.87c-0.271,0.25-0.596,0.375-0.975,0.375c-0.377,0-0.703-0.125-0.976-0.375
-		c-0.271-0.25-0.405-0.554-0.405-0.908s0.137-0.66,0.405-0.912c0.272-0.252,0.599-0.379,0.976-0.379
-		c0.379,0,0.703,0.127,0.975,0.379c0.268,0.252,0.402,0.558,0.402,0.912S-30.207-22.12-30.474-21.87z"/>
-	<path fill="#FFFFFF" d="M-30.289-19.925c-0.094-0.084-0.224-0.131-0.343-0.19c-0.264-0.127-0.561-0.216-0.946-0.216
-		c-0.309,0-0.635,0.057-0.981,0.166c-0.055,0.019-0.118,0.046-0.172,0.063c-0.064,0.142-0.103,0.3-0.103,0.466
-		c0,0.11,0.034,0.213,0.063,0.313c0.205,0.018,0.367,0.057,0.453,0.138c0.104,0.103,0.162,0.285,0.162,0.548
-		c0,0.014-0.006,0.03-0.006,0.045c-0.003,0.135-0.016,0.277-0.048,0.437c-0.035,0.174-0.078,0.36-0.131,0.558l-0.58,2.048
-		c-0.051,0.215-0.088,0.407-0.11,0.578c-0.022,0.172-0.035,0.338-0.035,0.502c0,0.422,0.155,0.769,0.467,1.041
-		c0.182,0.159,0.416,0.258,0.682,0.325c0.189,0.048,0.393,0.086,0.626,0.086c0.224,0,0.425-0.024,0.614-0.06
-		c0.322-0.202,0.547-0.543,0.553-0.948c-0.188-0.019-0.345-0.056-0.436-0.129c-0.121-0.099-0.18-0.282-0.18-0.554
-		c0-0.078,0.012-0.19,0.029-0.318c0.008-0.053,0.014-0.1,0.023-0.159c0.035-0.21,0.078-0.397,0.125-0.562l0.58-2.042
-		c0.057-0.188,0.096-0.394,0.117-0.616c0.02-0.226,0.029-0.382,0.029-0.472C-29.833-19.306-29.988-19.657-30.289-19.925z"/>
-</g>
-<g>
-	<g>
-		<path d="M-33.049,19.715c-0.068,0.068-0.15,0.123-0.242,0.162c-0.281,0.115-0.604,0.051-0.818-0.162l-2.121-2.121
-			c-0.293-0.293-0.293-0.769,0-1.061l2.121-2.122c0.215-0.216,0.537-0.279,0.818-0.163c0.279,0.117,0.463,0.391,0.463,0.693v4.242
-			C-32.828,19.387-32.91,19.576-33.049,19.715z M-34.639,17.063l0.311,0.313v-0.621L-34.639,17.063z"/>
-	</g>
-	<g>
-		<path d="M-35.346,16.313c-0.138,0-0.25,0.112-0.25,0.25v1c0,0.14,0.112,0.25,0.25,0.25h7.646c0.138,0,0.25-0.11,0.25-0.25v-1
-			c0-0.138-0.112-0.25-0.25-0.25H-35.346z"/>
-	</g>
-	<g>
-		<path d="M-26.67,24.593l-2.121,2.121c-0.215,0.216-0.537,0.278-0.816,0.163c-0.281-0.117-0.463-0.391-0.463-0.693l-0.002-4.242
-			c0.002-0.303,0.184-0.575,0.463-0.691c0.281-0.116,0.604-0.052,0.818,0.162l2.121,2.122C-26.377,23.824-26.377,24.3-26.67,24.593z
-			"/>
-	</g>
-	<g>
-		<path d="M-35.449,24.563c0,0.14,0.112,0.25,0.25,0.25h7.646c0.138,0,0.25-0.11,0.25-0.25v-1c0-0.138-0.112-0.25-0.25-0.25h-7.646
-			c-0.138,0-0.25,0.112-0.25,0.25V24.563z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#FFFFFF" d="M-34.664,37.307c-0.068,0.067-0.15,0.123-0.242,0.161c-0.281,0.115-0.604,0.052-0.818-0.161l-2.121-2.121
-			c-0.293-0.293-0.293-0.77,0-1.062l2.121-2.122c0.215-0.215,0.537-0.279,0.818-0.163c0.279,0.117,0.463,0.39,0.463,0.693v4.241
-			C-34.443,36.979-34.525,37.167-34.664,37.307z M-36.254,34.652l0.311,0.312v-0.621L-36.254,34.652z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M-36.961,33.902c-0.138,0-0.25,0.113-0.25,0.25v1c0,0.139,0.112,0.25,0.25,0.25h7.646
-			c0.138,0,0.25-0.111,0.25-0.25v-1c0-0.137-0.112-0.25-0.25-0.25H-36.961z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M-28.285,42.184l-2.121,2.121c-0.215,0.215-0.537,0.278-0.816,0.163c-0.281-0.116-0.463-0.39-0.463-0.692
-			l-0.002-4.241c0.002-0.306,0.184-0.577,0.463-0.693c0.281-0.114,0.604-0.052,0.818,0.162l2.121,2.122
-			C-27.992,41.415-27.992,41.891-28.285,42.184z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M-37.064,42.152c0,0.139,0.112,0.25,0.25,0.25h7.646c0.138,0,0.25-0.111,0.25-0.25v-1
-			c0-0.137-0.112-0.25-0.25-0.25h-7.646c-0.138,0-0.25,0.113-0.25,0.25V42.152z"/>
-	</g>
-</g>
-<g>
-	<path d="M-56.119,0.351c0,3.18-2.32,5.758-5.185,5.758c-2.742,0-4.986-2.362-5.174-5.353c-0.008-0.133-0.013-0.268-0.013-0.405
-		c0-3.18,2.321-5.758,5.187-5.758C-58.441-5.406-56.119-2.828-56.119,0.351z M-53.305,7.725h-16l1.838-3.293l1.232-5.874
-		l9.878,0.069l1.243,5.831L-53.305,7.725z"/>
-	<ellipse cx="-61.306" cy="-4.992" rx="1.403" ry="1.311"/>
-	<path d="M-61.306,6.428c1.405,0,2.546,0.586,2.546,1.31c0,0.723-1.141,1.962-2.546,1.962c-1.406,0-2.546-1.24-2.546-1.963
-		S-62.713,6.428-61.306,6.428z"/>
-</g>
-<path id="checkmark" display="none" fill="#FFFFFF" d="M7.192,11.793c-0.213,0-0.419-0.085-0.57-0.236l-2.42-2.41
-	c-0.315-0.313-0.315-0.821,0-1.137c0.315-0.314,0.825-0.313,1.141,0l1.796,1.789l3.468-4.146c0.283-0.341,0.793-0.387,1.137-0.102
-	c0.342,0.283,0.388,0.79,0.104,1.131l-4.034,4.822c-0.146,0.173-0.356,0.277-0.583,0.288C7.216,11.793,7.204,11.793,7.192,11.793z"
-	/>
-<g id="lines">
-	
-		<line fill="none" stroke="#FFFFFF" stroke-width="1.8" stroke-linecap="round" stroke-miterlimit="24" x1="-64.926" y1="0.332" x2="-63.452" y2="4.736"/>
-	
-		<line fill="none" stroke="#FFFFFF" stroke-width="1.8" stroke-linecap="round" stroke-miterlimit="24" x1="-61.328" y1="-0.365" x2="-61.328" y2="4.559"/>
-	
-		<line fill="none" stroke="#FFFFFF" stroke-width="1.8" stroke-linecap="round" stroke-miterlimit="24" x1="-57.684" y1="0.332" x2="-59.156" y2="4.736"/>
-</g>
-<g>
-	<path d="M8,2.5c3.032,0,5.5,2.467,5.5,5.5c0,3.032-2.468,5.5-5.5,5.5c-3.033,0-5.5-2.468-5.5-5.5C2.5,4.967,4.967,2.5,8,2.5 M8,0.5
-		C3.857,0.5,0.5,3.858,0.5,8c0,4.143,3.357,7.5,7.5,7.5s7.5-3.357,7.5-7.5C15.5,3.858,12.143,0.5,8,0.5L8,0.5z"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/switch.svg b/client/client-editor/src/main/resources/webapp/resources/16px/switch.svg
deleted file mode 100644
index cb697eade..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/switch.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1 16 16" overflow="visible" enable-background="new -1 -1 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path d="M0.75,4.5c-0.097,0-0.194-0.019-0.287-0.056C0.183,4.328,0,4.054,0,3.75v-3C0,0.337,0.336,0,0.75,0h3
-	c0.304,0,0.577,0.184,0.693,0.464C4.559,0.744,4.495,1.066,4.28,1.28l-3,3C1.137,4.425,0.945,4.5,0.75,4.5 M1.5,1.5v0.439L1.939,1.5
-	H1.5z"/>
-<path d="M13.25,4.5c-0.195,0-0.387-0.075-0.53-0.22l-3-3C9.505,1.066,9.441,0.744,9.557,0.464C9.673,0.184,9.946,0,10.25,0h3
-	C13.664,0,14,0.337,14,0.75v3c0,0.304-0.183,0.578-0.463,0.694C13.444,4.481,13.347,4.5,13.25,4.5 M12.061,1.5L12.5,1.939V1.5
-	H12.061z"/>
-<path d="M13.25,14h-3c-0.304,0-0.577-0.182-0.693-0.463c-0.115-0.279-0.052-0.602,0.163-0.816l3-3
-	c0.215-0.214,0.537-0.279,0.817-0.162C13.816,9.674,14,9.946,14,10.25v3C14,13.664,13.664,14,13.25,14"/>
-<path d="M3.75,14h-3C0.336,14,0,13.664,0,13.25v-3c0-0.304,0.183-0.576,0.463-0.691c0.28-0.117,0.602-0.052,0.817,0.162l3,3
-	c0.215,0.215,0.278,0.537,0.163,0.816C4.327,13.818,4.054,14,3.75,14 M1.5,12.5h0.439L1.5,12.062V12.5z"/>
-<rect x="2.455" y="-0.162" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -1.3279 3.2048)" width="1.5" height="6.735"/>
-<rect x="10.045" y="-0.163" transform="matrix(0.7068 0.7074 -0.7074 0.7068 5.433 -6.6972)" width="1.501" height="6.736"/>
-<rect x="7.428" y="10.046" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 10.7951 26.0633)" width="6.735" height="1.501"/>
-<rect x="2.454" y="7.428" transform="matrix(-0.7068 -0.7074 0.7074 -0.7068 -2.1678 20.6933)" width="1.501" height="6.735"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/switchBetween_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/switchBetween_black_16px.svg
deleted file mode 100644
index a5eddea0d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/switchBetween_black_16px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#1d1d1b;}</style></defs><title>switchBetween_black_16px</title><path class="cls-1" d="M13,4H7V1L2,4A.68.68,0,0,0,2,5L7,8V5h6Z"/><path class="cls-1" d="M14,11,9,8v3H3v1H9v3l5-3A.68.68,0,0,0,14,11Z"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/switchBetween_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/switchBetween_white_16px.svg
deleted file mode 100644
index 90ad7be3a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/switchBetween_white_16px.svg
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path d="M22.923-8.587c-3.123,3.124-3.123,8.19,0,11.313c3.124,3.125,8.191,3.125,11.314,0c3.125-3.123,3.125-8.189,0-11.313
-	C31.114-11.711,26.047-11.711,22.923-8.587 M32.581-3.931c0.553,0,1,0.447,1,1c0,0.276-0.111,0.526-0.293,0.707
-	s-0.432,0.292-0.707,0.292l-3.002,0.001V1.07c0.002,0.275-0.109,0.525-0.291,0.705c-0.182,0.182-0.432,0.293-0.708,0.293
-	c-0.552,0-0.999-0.447-1-1v-2.999h-2.999c-0.553-0.001-1-0.448-1-1c0-0.552,0.447-1,1-1h2.999v-3c0-0.553,0.447-1,1-1
-	c0.554,0,1.001,0.447,1.001,1L29.579-3.93L32.581-3.931z"/>
-<path fill="#B1B3B4" d="M35.438,17.073H21.724c-0.632,0-1.143,0.516-1.143,0.878v7.625c0,0.029,0.023,0.057,0.029,0.084
-	c0.303,4.143,3.75,7.413,7.971,7.413s7.668-3.271,7.971-7.413c0.006-0.029,0.029-0.055,0.029-0.086v-7.646
-	C36.581,17.564,36.067,17.073,35.438,17.073z"/>
-<g>
-	<g>
-		<ellipse fill="#B1B3B4" cx="40.287" cy="5.099" rx="3.705" ry="3.87"/>
-	</g>
-	<rect x="46.185" y="-2.93" fill="#B1B3B4" width="5.845" height="6.104"/>
-	<path fill="#B1B3B4" d="M52.029,3.682h-5.845c-0.269,0-0.485-0.227-0.485-0.51V-2.93c0-0.281,0.217-0.508,0.485-0.508h5.845
-		c0.271,0,0.488,0.227,0.488,0.508v6.104C52.518,3.455,52.3,3.682,52.029,3.682z M46.673,2.664h4.87v-5.085h-4.87V2.664z"/>
-	<path fill="#B1B3B4" d="M52.089,5.375h-5.899c-0.271,0-0.49,0.231-0.49,0.393v3.426c0,0.013,0.009,0.025,0.012,0.038
-		c0.131,1.862,1.613,3.331,3.43,3.331c1.814,0,3.298-1.469,3.428-3.331c0.002-0.015,0.013-0.025,0.013-0.038V5.758
-		C52.581,5.594,52.359,5.375,52.089,5.375z"/>
-</g>
-<g>
-	<g>
-		<path d="M37.771-18.239c0,0.825-0.675,1.5-1.5,1.5h-13c-0.825,0-1.5-0.675-1.5-1.5v-13c0-0.825,0.675-1.5,1.5-1.5h13
-			c0.825,0,1.5,0.675,1.5,1.5V-18.239z"/>
-	</g>
-	<g>
-		
-			<circle fill="none" stroke="#FFFFFF" stroke-width="0.75" stroke-linecap="round" stroke-miterlimit="10" stroke-dasharray="2.5714,2.5714" cx="29.772" cy="-24.739" r="6.67"/>
-	</g>
-	<circle fill="#FFFFFF" stroke="#FFFFFF" stroke-linecap="round" stroke-miterlimit="10" cx="29.771" cy="-24.739" r="2.325"/>
-</g>
-<g>
-	<g>
-		<path d="M68.582-18.894c0,0.825-0.676,1.5-1.5,1.5h-13c-0.826,0-1.5-0.675-1.5-1.5v-13c0-0.825,0.674-1.5,1.5-1.5h13
-			c0.824,0,1.5,0.675,1.5,1.5V-18.894z"/>
-	</g>
-	<g>
-		<g>
-			<path fill="#FFFFFF" d="M57.553-21.375c-0.182,0.184-0.479,0.184-0.662,0l-0.33-0.33c-0.184-0.183-0.184-0.48,0-0.663
-				l7.049-7.046c0.184-0.183,0.482-0.183,0.662-0.002l0.332,0.332c0.182,0.183,0.182,0.479,0,0.662L57.553-21.375z"/>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M64.604-22.366c0.184,0.182,0.184,0.48,0,0.663l-0.332,0.33c-0.184,0.182-0.48,0.182-0.662,0
-				l-7.049-7.049c-0.184-0.183-0.184-0.481,0-0.662l0.332-0.332c0.182-0.181,0.479-0.181,0.66,0L64.604-22.366z"/>
-		</g>
-	</g>
-	<g>
-		
-			<circle fill="none" stroke="#FFFFFF" stroke-width="0.75" stroke-linecap="round" stroke-miterlimit="10" cx="60.582" cy="-25.394" r="7.16"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#FFFFFF" d="M68.582,27.463c-3.805,0-6.9-3.096-6.9-6.9s3.096-6.9,6.9-6.9s6.9,3.096,6.9,6.9
-			S72.387,27.463,68.582,27.463z"/>
-		<path d="M68.582,14.763c3.198,0,5.8,2.602,5.8,5.8s-2.602,5.8-5.8,5.8s-5.8-2.602-5.8-5.8S65.384,14.763,68.582,14.763
-			 M68.582,12.563c-4.418,0-8,3.581-8,8s3.582,8,8,8c4.419,0,8-3.581,8-8S73.001,12.563,68.582,12.563L68.582,12.563z"/>
-	</g>
-	<g>
-		
-			<line fill="#FFFFFF" stroke="#000000" stroke-width="2.2" stroke-linecap="round" stroke-miterlimit="10" x1="72.02" y1="20.563" x2="65.146" y2="20.563"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M-2.615-17.571c0,0.275-0.225,0.5-0.5,0.5H-7.5c-0.275,0-0.5-0.225-0.5-0.5v-14.243c0-0.275,0.225-0.5,0.5-0.5h4.385
-			c0.275,0,0.5,0.225,0.5,0.5V-17.571z"/>
-	</g>
-	<path d="M1.615-32.739"/>
-	<g>
-		<path d="M0.09-31.896c0-0.413,0.238-0.511,0.529-0.218l6.852,6.89c0.291,0.292,0.291,0.771,0,1.063l-6.852,6.89
-			c-0.291,0.293-0.529,0.194-0.529-0.218V-31.896z"/>
-	</g>
-</g>
-<g>
-	<circle fill="#31BADD" cx="-31.451" cy="-18.069" r="8"/>
-	<path fill="#FFFFFF" d="M-30.474-21.87c-0.271,0.25-0.596,0.375-0.975,0.375c-0.377,0-0.703-0.125-0.976-0.375
-		c-0.271-0.25-0.405-0.554-0.405-0.908s0.137-0.66,0.405-0.912c0.272-0.252,0.599-0.379,0.976-0.379
-		c0.379,0,0.703,0.127,0.975,0.379c0.268,0.252,0.402,0.558,0.402,0.912S-30.207-22.12-30.474-21.87z"/>
-	<path fill="#FFFFFF" d="M-30.289-19.925c-0.094-0.084-0.224-0.131-0.343-0.19c-0.264-0.127-0.561-0.216-0.946-0.216
-		c-0.309,0-0.635,0.057-0.981,0.166c-0.055,0.019-0.118,0.046-0.172,0.063c-0.064,0.142-0.103,0.3-0.103,0.466
-		c0,0.11,0.034,0.213,0.063,0.313c0.205,0.018,0.367,0.057,0.453,0.138c0.104,0.103,0.162,0.285,0.162,0.548
-		c0,0.014-0.006,0.03-0.006,0.045c-0.003,0.135-0.016,0.277-0.048,0.437c-0.035,0.174-0.078,0.36-0.131,0.558l-0.58,2.048
-		c-0.051,0.215-0.088,0.407-0.11,0.578c-0.022,0.172-0.035,0.338-0.035,0.502c0,0.422,0.155,0.769,0.467,1.041
-		c0.182,0.159,0.416,0.258,0.682,0.325c0.189,0.048,0.393,0.086,0.626,0.086c0.224,0,0.425-0.024,0.614-0.06
-		c0.322-0.202,0.547-0.543,0.553-0.948c-0.188-0.019-0.345-0.056-0.436-0.129c-0.121-0.099-0.18-0.282-0.18-0.554
-		c0-0.078,0.012-0.19,0.029-0.318c0.008-0.053,0.014-0.1,0.023-0.159c0.035-0.21,0.078-0.397,0.125-0.562l0.58-2.042
-		c0.057-0.188,0.096-0.394,0.117-0.616c0.02-0.226,0.029-0.382,0.029-0.472C-29.833-19.306-29.988-19.657-30.289-19.925z"/>
-</g>
-<g>
-	<g>
-		<path d="M46.984,21.523c-0.068,0.068-0.15,0.123-0.242,0.162c-0.281,0.115-0.604,0.051-0.818-0.162l-2.121-2.121
-			c-0.293-0.293-0.293-0.768,0-1.061l2.121-2.121c0.215-0.215,0.537-0.279,0.818-0.164c0.279,0.117,0.463,0.391,0.463,0.693v4.242
-			C47.205,21.195,47.123,21.385,46.984,21.523z M45.395,18.871l0.311,0.311v-0.621L45.395,18.871z"/>
-	</g>
-	<g>
-		<path d="M44.688,18.121c-0.138,0-0.25,0.113-0.25,0.25v1c0,0.139,0.112,0.25,0.25,0.25h7.647c0.138,0,0.25-0.111,0.25-0.25v-1
-			c0-0.137-0.112-0.25-0.25-0.25H44.688z"/>
-	</g>
-	<g>
-		<path d="M53.364,26.402l-2.121,2.121c-0.215,0.215-0.537,0.277-0.816,0.162c-0.281-0.117-0.463-0.389-0.463-0.693l-0.002-4.242
-			c0.002-0.303,0.184-0.576,0.463-0.693c0.281-0.115,0.604-0.051,0.818,0.162l2.121,2.123
-			C53.657,25.633,53.657,26.109,53.364,26.402z"/>
-	</g>
-	<g>
-		<path d="M44.584,26.371c0,0.138,0.112,0.25,0.25,0.25h7.647c0.138,0,0.25-0.112,0.25-0.25v-1c0-0.138-0.112-0.25-0.25-0.25h-7.647
-			c-0.138,0-0.25,0.112-0.25,0.25V26.371z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#FFFFFF" d="M6.401,7.152c-0.068,0.068-0.15,0.123-0.242,0.162C5.878,7.43,5.556,7.365,5.341,7.152L3.22,5.031
-			c-0.293-0.293-0.293-0.769,0-1.061l2.121-2.122c0.215-0.215,0.537-0.279,0.818-0.163c0.279,0.117,0.463,0.39,0.463,0.693v4.242
-			C6.622,6.824,6.54,7.014,6.401,7.152z M4.812,4.5l0.311,0.311V4.189L4.812,4.5z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M4.104,3.75c-0.138,0-0.25,0.112-0.25,0.25v1c0,0.138,0.112,0.25,0.25,0.25h7.646
-			c0.138,0,0.25-0.112,0.25-0.25V4c0-0.138-0.112-0.25-0.25-0.25H4.104z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M12.78,12.03l-2.121,2.121c-0.215,0.215-0.537,0.278-0.816,0.163c-0.281-0.117-0.463-0.39-0.463-0.693
-			L9.378,9.379C9.38,9.075,9.562,8.802,9.841,8.686c0.281-0.116,0.604-0.052,0.818,0.162l2.121,2.122
-			C13.073,11.262,13.073,11.737,12.78,12.03z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M4.001,12c0,0.138,0.112,0.25,0.25,0.25h7.646c0.138,0,0.25-0.112,0.25-0.25v-1
-			c0-0.138-0.112-0.25-0.25-0.25H4.251c-0.138,0-0.25,0.112-0.25,0.25V12z"/>
-	</g>
-</g>
-<g>
-	<path d="M-20.475-1.225c0,3.18-2.322,5.758-5.185,5.758c-2.742,0-4.986-2.362-5.174-5.353c-0.008-0.134-0.013-0.269-0.013-0.405
-		c0-3.18,2.321-5.758,5.187-5.758C-22.797-6.983-20.475-4.405-20.475-1.225z"/>
-	<polygon points="-19.254,6.813 -32.066,6.813 -30.847,-1.854 -20.475,-1.854 	"/>
-	<ellipse cx="-25.661" cy="-6.569" rx="1.403" ry="1.311"/>
-	<ellipse cx="-25.661" cy="6.813" rx="2.546" ry="1.309"/>
-</g>
-<g>
-	<path d="M1.019-8.453c0,3.18-2.321,5.758-5.186,5.758c-2.741,0-4.985-2.362-5.173-5.353c-0.008-0.134-0.013-0.269-0.013-0.405
-		c0-3.18,2.321-5.758,5.186-5.758S1.019-11.633,1.019-8.453z"/>
-	<polygon points="2.239,-0.414 -10.573,-0.414 -9.353,-9.082 1.019,-9.082 	"/>
-	<ellipse cx="-4.167" cy="-13.797" rx="1.403" ry="1.311"/>
-	<ellipse cx="-4.167" cy="-0.414" rx="2.546" ry="1.309"/>
-	<path fill="#FFFFFF" d="M-4.612-2.695c-0.213,0-0.419-0.085-0.57-0.236l-2.42-2.41c-0.315-0.314-0.315-0.823,0-1.137
-		s0.825-0.313,1.141,0l1.796,1.789l3.468-4.146c0.285-0.341,0.794-0.387,1.137-0.102c0.342,0.283,0.388,0.79,0.103,1.131
-		l-4.033,4.822c-0.146,0.173-0.356,0.278-0.583,0.288C-4.588-2.695-4.6-2.695-4.612-2.695z"/>
-</g>
-<g>
-	<g>
-		<path d="M14.779-11.072c0,3.18-2.321,5.758-5.186,5.758c-2.741,0-4.985-2.362-5.173-5.353c-0.008-0.134-0.013-0.269-0.013-0.405
-			c0-3.18,2.321-5.758,5.186-5.758S14.779-14.252,14.779-11.072z"/>
-		<polygon points="16,-3.033 3.188,-3.033 4.408,-11.701 14.779,-11.701 		"/>
-		<ellipse cx="9.594" cy="-16.416" rx="1.403" ry="1.311"/>
-		<ellipse cx="9.594" cy="-3.033" rx="2.546" ry="1.309"/>
-	</g>
-	
-		<line fill="#FFFFFF" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="bevel" stroke-miterlimit="24" x1="5.996" y1="-11.189" x2="7.47" y2="-6.048"/>
-	
-		<line fill="#FFFFFF" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="bevel" stroke-miterlimit="24" x1="9.594" y1="-12.005" x2="9.594" y2="-6.256"/>
-	
-		<line fill="#FFFFFF" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="bevel" stroke-miterlimit="24" x1="13.238" y1="-11.189" x2="11.765" y2="-6.048"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/switchFunction_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/switchFunction_black_16px.svg
deleted file mode 100644
index 37135c10e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/switchFunction_black_16px.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<rect x="8" y="389.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<g>
-	<g>
-		<path d="M14.654,12.264c0.022-0.094,0.106-0.156,0.201-0.156H16v-1.394h-1.145c-0.095,0-0.179-0.063-0.201-0.155
-			c-0.077-0.295-0.194-0.58-0.348-0.843c-0.048-0.079-0.035-0.183,0.03-0.25l0.81-0.812l-0.983-0.981l-0.81,0.808
-			c-0.066,0.068-0.172,0.08-0.252,0.033c-0.263-0.153-0.547-0.27-0.841-0.347c-0.092-0.022-0.155-0.108-0.155-0.201V6.82h-1.393
-			v1.145c0,0.093-0.062,0.179-0.156,0.201C10.262,8.244,9.98,8.36,9.715,8.514c-0.08,0.047-0.184,0.035-0.25-0.033L8.656,7.673
-			L7.672,8.654l0.81,0.812c0.067,0.067,0.083,0.171,0.032,0.25c-0.153,0.263-0.269,0.548-0.349,0.843
-			c-0.024,0.092-0.106,0.155-0.203,0.155H6.819v1.394h1.143c0.097,0,0.179,0.062,0.203,0.156c0.08,0.295,0.195,0.576,0.349,0.842
-			c0.051,0.078,0.035,0.183-0.032,0.25l-0.81,0.809l0.984,0.984l0.809-0.81c0.066-0.067,0.17-0.079,0.25-0.032
-			c0.266,0.153,0.547,0.271,0.844,0.349c0.092,0.022,0.155,0.106,0.155,0.2V16h1.392v-1.145c0-0.095,0.064-0.179,0.156-0.201
-			c0.295-0.077,0.578-0.194,0.842-0.348c0.08-0.048,0.185-0.035,0.252,0.031l0.809,0.811l0.984-0.985l-0.811-0.808
-			c-0.066-0.068-0.078-0.172-0.031-0.252C14.46,12.84,14.577,12.559,14.654,12.264z M11.408,13.104
-			c-0.934,0-1.692-0.759-1.692-1.692c0-0.937,0.759-1.695,1.692-1.695c0.938,0,1.695,0.759,1.695,1.695
-			C13.104,12.346,12.346,13.104,11.408,13.104z"/>
-	</g>
-</g>
-<g>
-	<path d="M2.341,6.652C2.556,6.866,2.878,6.93,3.159,6.815C3.251,6.776,3.333,6.72,3.401,6.652
-		c0.139-0.138,0.22-0.327,0.22-0.53V4.75H9v-1.5H3.622V1.878c0-0.304-0.184-0.577-0.463-0.693C2.878,1.069,2.556,1.134,2.341,1.349
-		L0.22,3.47c-0.293,0.292-0.293,0.768,0,1.062L2.341,6.652z"/>
-	<path d="M5.917,11.251H3.622V9.88c0-0.305-0.184-0.577-0.463-0.692C2.878,9.068,2.556,9.134,2.341,9.35L0.22,11.471
-		c-0.293,0.293-0.293,0.769,0,1.062l2.121,2.12c0.215,0.215,0.537,0.279,0.818,0.164c0.092-0.039,0.174-0.096,0.242-0.164
-		c0.139-0.137,0.22-0.326,0.22-0.529v-1.371H6.08c-0.108-0.43-0.171-0.877-0.171-1.341C5.909,11.355,5.916,11.305,5.917,11.251z"/>
-	<path d="M7.818,7.25H4v1.5h2.597C6.913,8.18,7.329,7.673,7.818,7.25z"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/tableView_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/tableView_black_16px.svg
deleted file mode 100644
index 93d2b52a2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/tableView_black_16px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 15"><defs><style>.cls-1{fill:#333;}</style></defs><title>tableView</title><path class="cls-1" d="M15.38,8H.62A.57.57,0,0,1,0,7.5.57.57,0,0,1,.62,7H15.38a.57.57,0,0,1,.62.5.57.57,0,0,1-.62.5" transform="translate(0 -1)"/><path class="cls-1" d="M15.38,12H.62A.57.57,0,0,1,0,11.5.57.57,0,0,1,.62,11H15.38a.57.57,0,0,1,.62.5.57.57,0,0,1-.62.5" transform="translate(0 -1)"/><path class="cls-1" d="M15.38,16H.62a.51.51,0,1,1,0-1H15.38a.51.51,0,1,1,0,1" transform="translate(0 -1)"/><path class="cls-1" d="M10,15.38V2.62A.57.57,0,0,1,10.5,2a.57.57,0,0,1,.5.62V15.38a.57.57,0,0,1-.5.62.57.57,0,0,1-.5-.62" transform="translate(0 -1)"/><path class="cls-1" d="M5,15.38V2.62A.57.57,0,0,1,5.5,2a.57.57,0,0,1,.5.62V15.38a.57.57,0,0,1-.5.62.57.57,0,0,1-.5-.62" transform="translate(0 -1)"/><path class="cls-1" d="M0,15.38V2.62A.57.57,0,0,1,.5,2a.57.57,0,0,1,.5.62V15.38A.57.57,0,0,1,.5,16a.57.57,0,0,1-.5-.62" transform="translate(0 -1)"/><path class="cls-1" d="M15,15.38V2.62a.51.51,0,1,1,1,0V15.38a.51.51,0,1,1-1,0" transform="translate(0 -1)"/><rect class="cls-1" width="16" height="3.22" rx="1" ry="1"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/tableView_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/tableView_white_16px.svg
deleted file mode 100644
index e2d57827a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/tableView_white_16px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16.01 15.01"><defs><style>.cls-1{fill:#fff;}</style></defs><title>tableViewWhite</title><path class="cls-1" d="M15.38,7H.62A.57.57,0,0,1,0,6.5.57.57,0,0,1,.62,6H15.38a.57.57,0,0,1,.62.5.57.57,0,0,1-.62.5" transform="translate(0)"/><path class="cls-1" d="M15.38,11H.62A.57.57,0,0,1,0,10.5.57.57,0,0,1,.62,10H15.38a.57.57,0,0,1,.62.5.57.57,0,0,1-.62.5" transform="translate(0)"/><path class="cls-1" d="M15.38,15H.62a.51.51,0,1,1,0-1H15.38a.51.51,0,1,1,0,1" transform="translate(0)"/><path class="cls-1" d="M10,14.38V1.62A.57.57,0,0,1,10.5,1a.57.57,0,0,1,.5.62V14.38a.57.57,0,0,1-.5.62.57.57,0,0,1-.5-.62" transform="translate(0)"/><path class="cls-1" d="M5,14.38V1.62A.57.57,0,0,1,5.5,1a.57.57,0,0,1,.5.62V14.38a.57.57,0,0,1-.5.62.57.57,0,0,1-.5-.62" transform="translate(0)"/><path class="cls-1" d="M0,14.38V1.62A.57.57,0,0,1,.5,1a.57.57,0,0,1,.5.62V14.38A.57.57,0,0,1,.5,15a.57.57,0,0,1-.5-.62" transform="translate(0)"/><path class="cls-1" d="M15,14.38V1.62a.51.51,0,1,1,1,0V14.38a.51.51,0,1,1-1,0" transform="translate(0)"/><rect class="cls-1" width="16" height="3.22" rx="1" ry="1"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/technicianPresent_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/technicianPresent_16px.svg
deleted file mode 100644
index 35a222035..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/technicianPresent_16px.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 773.97 16 16" enable-background="new 8 773.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path fill="#F08A00" d="M21,774.97H11c-1.1,0-2,0.9-2,2v10c0,1.099,0.9,2,2,2h10c1.1,0,2-0.901,2-2v-10
-	C23,775.871,22.1,774.97,21,774.97z"/>
-<path fill="#FFFFFF" d="M17,782.27c0,0.385-0.315,0.7-0.7,0.7h-0.6c-0.385,0-0.7-0.315-0.7-0.7v-4.6c0-0.385,0.315-0.7,0.7-0.7h0.6
-	c0.385,0,0.7,0.315,0.7,0.7V782.27z"/>
-<path fill="#FFFFFF" d="M17,786.27c0,0.385-0.315,0.7-0.7,0.7h-0.6c-0.385,0-0.7-0.315-0.7-0.7v-0.6c0-0.385,0.315-0.7,0.7-0.7h0.6
-	c0.385,0,0.7,0.315,0.7,0.7V786.27z"/>
-<rect x="8" y="773.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/terminal_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/terminal_black_16px.svg
deleted file mode 100644
index 746df693c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/terminal_black_16px.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="13" y="2981.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<path d="M11-0.03H5c-0.55,0-2,1.45-2,2v12C3,14.52,4.45,16,5,16h6c0.55,0,2-1.48,2-2.03v-12C13,1.42,11.55-0.03,11-0.03z M11,11.97
-	H5v-10h6V11.97z"/>
-<circle fill="#FFFFFF" cx="8" cy="13.471" r="1"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/tick_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/tick_16px.svg
deleted file mode 100644
index ca1a0c79b..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/tick_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 421.971 16 16" enable-background="new 13 421.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path  d="M21,421.97c-4.418,0-8,3.582-8,8c0,4.418,3.582,8,8,8s8-3.582,8-8C29,425.552,25.418,421.97,21,421.97"/>
-<path fill="#FFFFFF" d="M20,433.97c-0.265,0-0.519-0.105-0.707-0.293l-3-3c-0.391-0.39-0.391-1.024,0-1.414s1.023-0.391,1.414,0
-	l2.226,2.226l4.299-5.159c0.353-0.424,0.983-0.482,1.408-0.128c0.424,0.354,0.481,0.984,0.128,1.408l-5,6
-	c-0.18,0.216-0.442,0.346-0.723,0.359C20.03,433.97,20.015,433.97,20,433.97z"/>
-<rect x="13" y="421.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/tick_green_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/tick_green_16px.svg
deleted file mode 100644
index 429e71708..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/tick_green_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 421.971 16 16" enable-background="new 13 421.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path fill="#89BA17" d="M21,421.97c-4.418,0-8,3.582-8,8c0,4.418,3.582,8,8,8s8-3.582,8-8C29,425.552,25.418,421.97,21,421.97"/>
-<path fill="#FFFFFF" d="M20,433.97c-0.265,0-0.519-0.105-0.707-0.293l-3-3c-0.391-0.39-0.391-1.024,0-1.414s1.023-0.391,1.414,0
-	l2.226,2.226l4.299-5.159c0.353-0.424,0.983-0.482,1.408-0.128c0.424,0.354,0.481,0.984,0.128,1.408l-5,6
-	c-0.18,0.216-0.442,0.346-0.723,0.359C20.03,433.97,20.015,433.97,20,433.97z"/>
-<rect x="13" y="421.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/tip_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/tip_black_16px.svg
deleted file mode 100644
index f1f56b96d..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/tip_black_16px.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2309.971 16 16" enable-background="new 13 2309.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M20.539,2311.54c0.146-0.003,0.27-0.095,0.321-0.224c0.016-0.042,0.025-0.087,0.024-0.135l-0.016-0.865
-	c-0.003-0.194-0.165-0.348-0.358-0.345c-0.194,0.004-0.349,0.164-0.345,0.359l0.016,0.864
-	C20.184,2311.389,20.344,2311.543,20.539,2311.54z"/>
-<path d="M23.081,2312.229c0.128,0.071,0.282,0.052,0.39-0.034c0.035-0.028,0.065-0.063,0.088-0.105l0.418-0.756
-	c0.094-0.17,0.032-0.384-0.138-0.478c-0.17-0.094-0.384-0.032-0.478,0.139l-0.418,0.756
-	C22.849,2311.921,22.911,2312.135,23.081,2312.229z"/>
-<path d="M25.293,2314.263c0.044-0.007,0.087-0.022,0.129-0.047l0.74-0.446c0.167-0.1,0.22-0.317,0.12-0.483
-	c-0.101-0.166-0.316-0.22-0.483-0.119l-0.74,0.446c-0.167,0.101-0.22,0.317-0.12,0.484
-	C25.014,2314.223,25.156,2314.284,25.293,2314.263z"/>
-<path d="M26.822,2316.27l-0.864,0.016c-0.194,0.004-0.349,0.165-0.346,0.359c0.003,0.147,0.096,0.27,0.225,0.321
-	c0.042,0.016,0.087,0.025,0.135,0.024l0.865-0.016c0.194-0.004,0.348-0.165,0.345-0.359
-	C27.177,2316.42,27.017,2316.266,26.822,2316.27z"/>
-<path d="M26.158,2319.467l-0.756-0.418c-0.17-0.094-0.384-0.032-0.479,0.138c-0.071,0.128-0.053,0.282,0.034,0.39
-	c0.028,0.035,0.063,0.065,0.105,0.088l0.756,0.418c0.17,0.094,0.384,0.032,0.478-0.138
-	C26.39,2319.775,26.329,2319.561,26.158,2319.467z"/>
-<path d="M17.508,2312.095c0.101,0.166,0.317,0.22,0.484,0.12c0.125-0.076,0.186-0.218,0.166-0.355
-	c-0.007-0.044-0.022-0.088-0.047-0.129l-0.446-0.741c-0.101-0.167-0.317-0.219-0.483-0.119c-0.167,0.101-0.22,0.316-0.119,0.483
-	L17.508,2312.095z"/>
-<path d="M14.889,2313.791l0.756,0.418c0.17,0.094,0.385,0.032,0.479-0.138c0.071-0.128,0.053-0.282-0.034-0.39
-	c-0.028-0.035-0.063-0.065-0.105-0.088l-0.756-0.418c-0.17-0.094-0.384-0.032-0.478,0.138
-	C14.657,2313.483,14.718,2313.697,14.889,2313.791z"/>
-<path d="M15.435,2316.614c-0.003-0.146-0.096-0.27-0.225-0.321c-0.041-0.016-0.087-0.025-0.135-0.024l-0.864,0.016
-	c-0.195,0.004-0.349,0.165-0.345,0.358c0.004,0.194,0.165,0.349,0.359,0.345l0.864-0.016
-	C15.283,2316.969,15.438,2316.808,15.435,2316.614z"/>
-<path d="M15.754,2318.995c-0.044,0.007-0.088,0.022-0.129,0.047l-0.741,0.446c-0.167,0.101-0.22,0.317-0.12,0.483
-	c0.101,0.166,0.317,0.219,0.483,0.119l0.741-0.446c0.166-0.1,0.22-0.317,0.12-0.483
-	C16.033,2319.035,15.891,2318.974,15.754,2318.995z"/>
-<path d="M20.5,2312.107c-2.538,0.017-4.5,2.084-4.5,4.627c0,1.489,0.799,2.82,1.716,3.937v1.2c0,0.212,0.1,0.393,0.284,0.469v0.63
-	c0,0.094,0.058,0.185,0.109,0.264l1.221,2.517c0.089,0.138,0.242,0.219,0.407,0.219H20.5h0.764c0.165,0,0.317-0.082,0.407-0.219
-	l1.221-2.517c0.051-0.078,0.109-0.17,0.109-0.264v-0.63c0.185-0.076,0.284-0.257,0.284-0.469v-1.2
-	c0.917-1.117,1.716-2.448,1.716-3.937C25,2314.191,23.038,2312.124,20.5,2312.107z M22.384,2320.165
-	c-0.089,0.107-0.127,0.24-0.116,0.37v0.929H20.5h-1.769v-0.929c0.012-0.13-0.027-0.263-0.116-0.37c-0.84-1.007-1.7-2.202-1.7-3.431
-	c0-1.981,1.604-3.592,3.584-3.611c1.98,0.019,3.584,1.629,3.584,3.611C24.084,2317.963,23.225,2319.158,22.384,2320.165z"/>
-<rect x="13" y="2309.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/tip_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/tip_white_16px.svg
deleted file mode 100644
index e1c149f1a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/tip_white_16px.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1.5 0 16 16" enable-background="new -1.5 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M6.673,1.569c0.146-0.003,0.27-0.095,0.32-0.224C7.01,1.303,7.019,1.258,7.018,1.21L7.002,0.346
-	C6.999,0.151,6.837-0.003,6.644,0C6.45,0.004,6.295,0.164,6.299,0.359l0.017,0.863C6.317,1.418,6.478,1.572,6.673,1.569z"/>
-<path fill="#FFFFFF" d="M9.215,2.258c0.128,0.071,0.282,0.053,0.39-0.033C9.64,2.196,9.671,2.161,9.692,2.119l0.418-0.756
-	c0.094-0.17,0.033-0.384-0.137-0.479c-0.17-0.094-0.385-0.031-0.479,0.14L9.077,1.78C8.983,1.95,9.045,2.164,9.215,2.258z"/>
-<path fill="#FFFFFF" d="M11.427,4.292c0.045-0.007,0.088-0.021,0.129-0.047l0.74-0.446c0.168-0.1,0.221-0.316,0.121-0.482
-	c-0.102-0.166-0.316-0.221-0.484-0.119l-0.74,0.446c-0.166,0.101-0.219,0.316-0.119,0.483C11.147,4.252,11.29,4.313,11.427,4.292z"
-	/>
-<path fill="#FFFFFF" d="M12.956,6.299l-0.863,0.017c-0.195,0.004-0.35,0.165-0.348,0.358c0.004,0.147,0.098,0.271,0.227,0.321
-	c0.041,0.017,0.086,0.025,0.135,0.024l0.865-0.017c0.193-0.004,0.348-0.165,0.344-0.358C13.312,6.449,13.151,6.295,12.956,6.299z"/>
-<path fill="#FFFFFF" d="M12.292,9.496l-0.756-0.418c-0.17-0.094-0.385-0.031-0.479,0.139c-0.072,0.127-0.053,0.281,0.033,0.39
-	c0.027,0.034,0.063,0.064,0.105,0.088l0.756,0.418c0.17,0.094,0.385,0.032,0.479-0.138S12.464,9.59,12.292,9.496z"/>
-<path fill="#FFFFFF" d="M3.642,2.124c0.102,0.166,0.317,0.22,0.484,0.12C4.251,2.168,4.312,2.026,4.292,1.89
-	C4.284,1.846,4.27,1.802,4.245,1.761L3.799,1.02C3.698,0.853,3.481,0.801,3.315,0.9c-0.166,0.102-0.22,0.316-0.119,0.483
-	L3.642,2.124z"/>
-<path fill="#FFFFFF" d="M1.022,3.82l0.756,0.418c0.17,0.094,0.385,0.032,0.479-0.138c0.071-0.128,0.053-0.282-0.034-0.39
-	C2.196,3.676,2.161,3.646,2.118,3.623L1.362,3.205C1.192,3.11,0.979,3.173,0.885,3.343C0.791,3.512,0.852,3.727,1.022,3.82z"/>
-<path fill="#FFFFFF" d="M1.569,6.644C1.565,6.497,1.473,6.373,1.344,6.322C1.303,6.307,1.257,6.297,1.209,6.299L0.345,6.314
-	C0.149,6.318-0.005,6.479,0,6.672c0.004,0.194,0.165,0.35,0.358,0.346l0.864-0.017C1.417,6.998,1.571,6.838,1.569,6.644z"/>
-<path fill="#FFFFFF" d="M1.888,9.024C1.844,9.031,1.8,9.047,1.759,9.071L1.018,9.518C0.851,9.619,0.798,9.834,0.897,10
-	c0.102,0.166,0.317,0.22,0.483,0.119l0.741-0.445c0.166-0.101,0.22-0.317,0.119-0.483C2.167,9.064,2.024,9.004,1.888,9.024z"/>
-<path fill="#FFFFFF" d="M6.634,2.137c-2.538,0.017-4.5,2.084-4.5,4.627c0,1.488,0.799,2.819,1.716,3.937v1.2
-	c0,0.212,0.101,0.393,0.284,0.469v0.63c0,0.094,0.059,0.185,0.109,0.264l1.221,2.518c0.089,0.138,0.242,0.219,0.406,0.219h0.764
-	h0.764c0.166,0,0.317-0.082,0.407-0.219l1.222-2.518c0.051-0.077,0.108-0.17,0.108-0.264v-0.63c0.185-0.076,0.284-0.257,0.284-0.469
-	v-1.2c0.918-1.117,1.717-2.448,1.717-3.937C11.134,4.221,9.172,2.153,6.634,2.137z M8.518,10.194
-	c-0.089,0.106-0.127,0.24-0.116,0.37v0.929H6.634h-1.77v-0.929c0.013-0.13-0.026-0.263-0.115-0.37c-0.84-1.007-1.7-2.202-1.7-3.431
-	c0-1.981,1.604-3.592,3.584-3.611c1.979,0.02,3.585,1.629,3.585,3.611C10.218,7.992,9.358,9.188,8.518,10.194z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/topology_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/topology_black_16px.svg
deleted file mode 100644
index 89e897b40..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/topology_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="8 101.97 16 16" enable-background="new 8 101.97 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="2381.97"/>
-<path d="M14,107.97h4c0,0.553,0.447,1,1,1h1c0.552,0,1-0.447,1-1c0-0.186,0-0.814,0-1c0-0.552-0.448-1-1-1h-1c-0.553,0-1,0.448-1,1
-	h-4v-1h1c0.552,0,1-0.447,1-1c0-0.186,0-0.814,0-1c0-0.552-0.448-1-1-1h-3c-0.553,0-1,0.448-1,1c0,0.186,0,0.814,0,1
-	c0,0.553,0.447,1,1,1h1v1.344v0.656v2.906v1.094v4h5c0,0.553,0.447,1,1,1h1c0.552,0,1-0.447,1-1c0-0.186,0-0.814,0-1
-	c0-0.553-0.448-1-1-1h-1c-0.553,0-1,0.447-1,1h-4v-3h4c0,0.553,0.447,1,1,1h1c0.552,0,1-0.447,1-1c0-0.186,0-0.814,0-1
-	c0-0.553-0.448-1-1-1h-1c-0.553,0-1,0.447-1,1h-4v-0.094V107.97z"/>
-<rect x="8" y="101.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/undo_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/undo_black_16px.svg
deleted file mode 100644
index 87500f2c8..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/undo_black_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="13" y="2757.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<path d="M4,0.176c-0.279,0-0.533,0.116-0.713,0.301l-2.83,2.794c-0.391,0.393-0.391,1.023,0,1.414L3.27,7.531
-	c0.18,0.181,0.432,0.294,0.707,0.293c0.554-0.002,1-0.447,1-1L5,1.177C4.998,0.624,4.552,0.177,4,0.176z"/>
-<g>
-	<path fill="none" stroke="#000000" stroke-width="2" stroke-miterlimit="10" d="M4,4c0,0,1.575,0,3.5,0S11,5.8,11,8s-1.35,4-3,4
-		c-1.65,0-3,0-3,0"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/undo_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/undo_white_16px.svg
deleted file mode 100644
index bb1f3b724..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/undo_white_16px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-2 -1.5 16 16" enable-background="new -2 -1.5 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M3.836,0C3.558,0,3.303,0.116,3.124,0.302l-2.83,2.794c-0.391,0.393-0.391,1.022,0,1.414l2.813,2.846
-	c0.18,0.181,0.432,0.294,0.707,0.293c0.554-0.002,1-0.447,1-1l0.023-5.648C4.834,0.448,4.388,0.001,3.836,0z"/>
-<path fill="#FFFFFF" d="M7.836,12.824h-3v-2h3c1.084,0,2-1.374,2-3c0-1.654-1.121-3-2.5-3h-3.5v-2h3.5c2.481,0,4.5,2.243,4.5,5
-	S10.041,12.824,7.836,12.824z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/unlock_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/unlock_black_16px.svg
deleted file mode 100644
index ef39609d4..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/unlock_black_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 901.971 16 16" enable-background="new 13 901.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M24.5,903.97h-1c-1.654,0-3,1.346-3,3v2H17c-1.104,0-2,0.896-2,2v3c0,1.104,0.896,2,2,2h5c1.104,0,2-0.896,2-2v-3
-	c0-1.104-0.896-2-2-2h-0.203v-2.483c0-0.729,0.659-1.322,1.469-1.322h1.469c0.811,0,1.469,0.594,1.469,1.322v2.483H27.5v-2
-	C27.5,905.316,26.154,903.97,24.5,903.97z"/>
-<rect x="13" y="901.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/unlock_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/unlock_white_16px.svg
deleted file mode 100644
index 6db85d727..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/unlock_white_16px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1 -1.5 16 16" enable-background="new -1 -1.5 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M8,5H2C0.896,5,0,5.896,0,7v4c0,1.104,0.896,2,2,2h6c1.104,0,2-0.896,2-2V7C10,5.896,9.104,5,8,5"/>
-<path fill="#FFFFFF" d="M13.5,5h-1.297V2.518c0-0.73-0.658-1.324-1.469-1.324H9.266c-0.81,0-1.469,0.594-1.469,1.324v4.291L6.5,6V3
-	c0-1.653,1.346-3,3-3h1c1.654,0,3,1.347,3,3V5z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/upload_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/upload_black_16px.svg
deleted file mode 100644
index a181fcd17..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/upload_black_16px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M8.707,1.293C8.512,1.097,8.256,1,8,1S7.488,1.098,7.293,1.293l-5,5c-0.391,0.39-0.391,1.022,0,1.413s1.023,0.391,1.414,0
-	L7,4.413V11c0,0.552,0.448,1,1,1s1-0.448,1-1V4.413l3.293,3.293c0.391,0.391,1.023,0.391,1.414,0s0.391-1.023,0-1.413L8.707,1.293z"
-	/>
-<path d="M14,13H2c-0.552,0-1,0.448-1,1s0.448,1,1,1h12c0.552,0,1-0.448,1-1S14.552,13,14,13z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/user_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/user_black_16px.svg
deleted file mode 100644
index 67386347b..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/user_black_16px.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<rect x="13" y="5.97" display="none" opacity="0.2" fill="#E94E47" enable-background="new    " width="16" height="16"/>
-<g>
-	<g>
-		<path d="M6.121,8.211c0.009,0.007,0.021,0.013,0.03,0.02c0.17,0.119,0.344,0.227,0.53,0.312c0.063,0.031,0.131,0.049,0.196,0.074
-			c0.141,0.055,0.28,0.113,0.428,0.146C7.53,8.817,7.761,8.848,8,8.848c0.238,0,0.47-0.03,0.694-0.084
-			C8.842,8.73,8.98,8.672,9.122,8.617c0.064-0.025,0.134-0.043,0.197-0.074c0.185-0.084,0.358-0.192,0.529-0.311
-			c0.01-0.007,0.021-0.013,0.03-0.021c0.182-0.129,0.35-0.277,0.509-0.441c0,0,0,0,0-0.001c0.79-0.811,1.3-2,1.3-3.345
-			C11.688,1.981,10.037,0,8,0c-2.036,0-3.688,1.98-3.688,4.424C4.312,6.041,5.042,7.44,6.121,8.211z"/>
-		<path d="M12.659,7.982c-1.383,2.13-2.404,2.483-4.659,2.483s-3.275-0.354-4.658-2.483c-1.632,1.597-1.349,3.339-1.349,5.263
-			c0,0.551,0,1.224,0,1.224C1.993,15.058,2.969,16,3.531,16h2.077c0.001,0,0.002,0,0.003,0C6.228,16,6.914,16,8,16
-			c1.087,0,1.771,0,2.389,0c0,0,0.002,0,0.003,0H12.5c0.531,0,1.521-1,1.521-1.562c0,0,0-0.767,0-1.317
-			C14.021,11.196,14.29,9.577,12.659,7.982z"/>
-	</g>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/user_white_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/user_white_16px.svg
deleted file mode 100644
index bb92940c2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/user_white_16px.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-1.5 0 16 16" enable-background="new -1.5 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M4.147,8.211c0.009,0.007,0.021,0.014,0.03,0.021c0.17,0.119,0.344,0.227,0.53,0.312
-	C4.77,8.574,4.838,8.592,4.903,8.617c0.142,0.055,0.28,0.113,0.429,0.146c0.225,0.053,0.455,0.084,0.694,0.084
-	c0.238,0,0.471-0.029,0.693-0.084C6.868,8.73,7.006,8.672,7.148,8.617c0.063-0.025,0.134-0.043,0.196-0.074
-	c0.185-0.084,0.358-0.191,0.529-0.311c0.01-0.007,0.021-0.013,0.03-0.021c0.183-0.129,0.351-0.276,0.509-0.44c0,0,0,0,0-0.001
-	c0.79-0.812,1.301-2,1.301-3.346C9.713,1.981,8.063,0,6.026,0C3.99,0,2.338,1.98,2.338,4.424C2.338,6.041,3.068,7.44,4.147,8.211z"
-	/>
-<path fill="#FFFFFF" d="M10.685,7.982c-1.384,2.129-2.404,2.482-4.659,2.482c-2.255,0-3.274-0.354-4.658-2.482
-	c-1.632,1.597-1.349,3.338-1.349,5.263c0,0.551,0,1.225,0,1.225c0,0.589,0.976,1.53,1.538,1.53h2.077c0.001,0,0.002,0,0.003,0
-	c0.617,0,1.303,0,2.389,0c1.087,0,1.771,0,2.388,0c0,0,0.002,0,0.004,0h2.107c0.531,0,1.521-1,1.521-1.563c0,0,0-0.767,0-1.316
-	C12.047,11.195,12.315,9.577,10.685,7.982z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/valid_icon.svg b/client/client-editor/src/main/resources/webapp/resources/16px/valid_icon.svg
deleted file mode 100644
index 5ccc9c812..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/valid_icon.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#89BA17" d="M8.57,0H1.429C0.643,0,0,0.643,0,1.432v7.136C0,9.355,0.643,10,1.429,10H8.57C9.357,10,10,9.355,10,8.568
-	V1.432C10,0.643,9.357,0,8.57,0"/>
-<path fill="#FFFFFF" d="M4.3,8C4.115,8,3.937,7.922,3.805,7.78l-2.1-2.25c-0.273-0.293-0.273-0.767,0-1.06s0.717-0.293,0.99,0
-	L4.253,6.14l3.01-3.869C7.51,1.952,7.951,1.908,8.248,2.174C8.545,2.439,8.586,2.912,8.337,3.23l-3.5,4.5
-	C4.712,7.893,4.528,7.99,4.331,7.999C4.321,8,4.311,8,4.3,8"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/warningShield_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/warningShield_black_16px.svg
deleted file mode 100644
index 156b7b44c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/warningShield_black_16px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 2469.971 16 16" enable-background="new 13 2469.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path d="M20.993,2469.97c0,0-4.733,1.037-6.142,2.684c-1.209,1.413,0.67,13.316,6.142,13.316s7.372-11.919,6.153-13.335
-	C25.737,2471,20.993,2469.97,20.993,2469.97z"/>
-<circle fill="#FFFFFF" cx="20.994" cy="2481.787" r="1.494"/>
-<path fill="#FFFFFF" d="M21.8,2478.054c0,0.507-0.359,0.917-0.802,0.917c-0.444,0-0.798-0.41-0.798-0.917v-5.166
-	c0-0.507,0.354-0.916,0.798-0.916c0.443,0,0.802,0.41,0.802,0.916V2478.054z"/>
-<rect x="13" y="2469.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/warningShield_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/warningShield_white.svg
deleted file mode 100644
index cc5b6814e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/warningShield_white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13 15"><defs><style>.cls-1{fill:#fff;}</style></defs><title>ebIcon_warningShield_white</title><path class="cls-1" d="M8,.5S3.26,1.47,1.85,3C.64,4.34,2.52,15.5,8,15.5S15.36,4.33,14.15,3C12.74,1.46,8,.5,8,.5m0,13A1.5,1.5,0,1,1,9.53,12,1.51,1.51,0,0,1,8,13.49M9,8.81A1,1,0,0,1,7,8.81V3.18A1,1,0,0,1,9,3.18Z" transform="translate(-1.5 -0.5)"/></svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/warning_orange_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/warning_orange_16px.svg
deleted file mode 100644
index beb36c162..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/warning_orange_16px.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="13 389.971 16 16" enable-background="new 13 389.971 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect display="none" fill="#66A19F" width="87" height="3280.97"/>
-<path fill="#F19619" d="M28.741,405.152c-0.315,0.51-0.871,0.818-1.471,0.818H14.729c-0.6,0-1.156-0.308-1.471-0.818
-	c-0.315-0.508-0.344-1.146-0.076-1.682l6.271-12.357c0.292-0.585,0.893-1.141,1.547-1.141s1.254,0.556,1.547,1.141l6.27,12.357
-	C29.086,404.006,29.057,404.643,28.741,405.152z"/>
-<path fill="#FFFFFF" d="M22,399.27c0,0.385-0.315,0.7-0.7,0.7h-0.6c-0.385,0-0.7-0.315-0.7-0.7v-4.6c0-0.385,0.315-0.7,0.7-0.7h0.6
-	c0.385,0,0.7,0.315,0.7,0.7V399.27z"/>
-<path fill="#FFFFFF" d="M22,403.27c0,0.385-0.315,0.7-0.7,0.7h-0.6c-0.385,0-0.7-0.315-0.7-0.7v-0.6c0-0.385,0.315-0.7,0.7-0.7h0.6
-	c0.385,0,0.7,0.315,0.7,0.7V403.27z"/>
-<rect x="13" y="389.97" display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/warning_white.svg b/client/client-editor/src/main/resources/webapp/resources/16px/warning_white.svg
deleted file mode 100644
index af8f03c7b..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/warning_white.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-0.5 -0.5 16 16" enable-background="new -0.5 -0.5 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<rect x="5.29" y="1.197" fill="#E32219" width="4.458" height="12.548"/>
-<path fill="#FFFFFF" d="M7.5,0C3.357,0,0,3.358,0,7.5S3.357,15,7.5,15S15,11.642,15,7.5S11.643,0,7.5,0 M7.5,12.994
-	c-0.826,0-1.495-0.668-1.495-1.494c0-0.827,0.669-1.495,1.495-1.495s1.495,0.668,1.495,1.495C8.995,12.326,8.326,12.994,7.5,12.994
-	 M8.5,8.314c0,0.554-0.447,1-1,1s-1-0.446-1-1v-5.63c0-0.552,0.447-1,1-1s1,0.448,1,1V8.314z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/16px/warning_yellow_16px.svg b/client/client-editor/src/main/resources/webapp/resources/16px/warning_yellow_16px.svg
deleted file mode 100644
index ec4ad4689..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/16px/warning_yellow_16px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0.001 16 16" enable-background="new 0 0.001 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FABB00" d="M15.741,15.182C15.426,15.692,14.871,16,14.27,16H1.729c-0.6,0-1.156-0.308-1.471-0.818
-	c-0.315-0.508-0.344-1.146-0.076-1.682L6.453,1.143C6.746,0.557,7.346,0.001,8,0.001s1.254,0.556,1.547,1.141l6.27,12.357
-	C16.086,14.036,16.057,14.673,15.741,15.182z"/>
-<rect x="7" y="5" fill="#FFFFFF" width="2" height="5"/>
-<rect x="7" y="12" fill="#FFFFFF" width="2" height="2"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/28px/error_red_28px.svg b/client/client-editor/src/main/resources/webapp/resources/28px/error_red_28px.svg
deleted file mode 100644
index d600e8134..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/28px/error_red_28px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="28px" height="28px" viewBox="0 0.001 28 28" enable-background="new 0 0.001 28 28" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#E32219" d="M14,1.001c-7.179,0-13,5.821-13,13c0,7.179,5.821,13,13,13c7.18,0,13-5.821,13-13
-	C27,6.822,21.18,1.001,14,1.001"/>
-<path fill="#FFFFFF" d="M20.269,17.873c0.664,0.665,0.664,1.736,0,2.398c-0.33,0.331-0.765,0.497-1.2,0.497
-	c-0.434,0-0.867-0.166-1.198-0.497l-3.598-3.597l-3.598,3.597c-0.331,0.331-0.765,0.497-1.198,0.497s-0.866-0.166-1.2-0.497
-	c-0.661-0.662-0.661-1.734,0-2.398l3.598-3.596L8.278,10.68c-0.661-0.662-0.661-1.735,0-2.398c0.664-0.662,1.737-0.662,2.398,0
-	l3.598,3.597l3.598-3.597c0.664-0.662,1.734-0.662,2.398,0s0.664,1.735,0,2.398l-3.599,3.597L20.269,17.873z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="28" height="28"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/28px/information_blue_28px.svg b/client/client-editor/src/main/resources/webapp/resources/28px/information_blue_28px.svg
deleted file mode 100644
index 71c70dd96..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/28px/information_blue_28px.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="28px" height="28px" viewBox="0 0.001 28 28" enable-background="new 0 0.001 28 28" xml:space="preserve">
-<defs>
-</defs>
-<circle fill="#00A9D4" cx="14" cy="14.001" r="13"/>
-<path fill="#FFFFFF" d="M14.016,9.001c-0.541,0-1.01-0.176-1.411-0.527C12.202,8.122,12,7.626,12,6.993
-	c0-0.551,0.192-1.023,0.577-1.41c0.382-0.391,0.855-0.582,1.411-0.582c0.555,0,1.029,0.191,1.423,0.582
-	C15.801,5.97,16,6.443,16,6.993c0,0.625-0.2,1.117-0.596,1.473C15.005,8.822,14.542,9.001,14.016,9.001z"/>
-<g>
-	<path fill="#FFFFFF" d="M15.5,21.001c0,1.1-0.675,2-1.5,2s-1.5-0.9-1.5-2v-7c0-1.1,0.675-2,1.5-2s1.5,0.9,1.5,2V21.001z"/>
-</g>
-<rect display="none" opacity="0.2" fill="#E94E47" width="28" height="28"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/28px/tick_green_28px.svg b/client/client-editor/src/main/resources/webapp/resources/28px/tick_green_28px.svg
deleted file mode 100644
index 55b7a2583..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/28px/tick_green_28px.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="28px" height="28px" viewBox="0 0.001 28 28" enable-background="new 0 0.001 28 28" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#89BA17" d="M14,1.001c-7.179,0-13,5.821-13,13c0,7.179,5.821,13,13,13c7.18,0,13-5.821,13-13
-	C27,6.822,21.18,1.001,14,1.001"/>
-<path fill="#FFFFFF" d="M12.304,20.22c-0.373,0-0.732-0.148-0.998-0.414l-4.239-4.239c-0.553-0.552-0.553-1.447,0-1.998
-	c0.551-0.552,1.446-0.552,1.998,0l3.145,3.145l6.076-7.289c0.498-0.599,1.388-0.681,1.988-0.181c0.599,0.5,0.682,1.391,0.181,1.99
-	l-7.064,8.478c-0.254,0.305-0.625,0.489-1.021,0.507C12.347,20.219,12.325,20.22,12.304,20.22z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="28" height="28"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/28px/warning_yellow_28px.svg b/client/client-editor/src/main/resources/webapp/resources/28px/warning_yellow_28px.svg
deleted file mode 100644
index e6f9a6134..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/28px/warning_yellow_28px.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="28px" height="28px" viewBox="0 0.001 28 28" enable-background="new 0 0.001 28 28" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FABB00" d="M26.58,25.669c-0.512,0.829-1.414,1.329-2.391,1.329H3.81c-0.974,0-1.878-0.5-2.39-1.329
-	c-0.512-0.826-0.559-1.862-0.124-2.733l10.19-20.08C11.962,1.905,12.937,1.001,14,1.001c1.063,0,2.039,0.904,2.514,1.855
-	l10.189,20.08C27.14,23.808,27.094,24.843,26.58,25.669z"/>
-<path fill="#FFFFFF" d="M14.016,24c-0.541,0-1.01-0.176-1.411-0.527C12.202,23.121,12,22.625,12,21.993
-	c0-0.551,0.192-1.023,0.577-1.41c0.384-0.39,0.855-0.582,1.411-0.582c0.555,0,1.029,0.191,1.423,0.582
-	C15.802,20.969,16,21.442,16,21.993c0,0.625-0.2,1.116-0.596,1.472C15.005,23.82,14.542,24,14.016,24z"/>
-<g>
-	<path fill="#FFFFFF" d="M14,7.784c-0.932,0-1.696,0.763-1.696,1.696v0.954c0,0,0-2.649,0,0.742s0.848,5.935,0.848,5.935
-		s0.239,0.848,0.848,0.848s0.848-0.848,0.848-0.848s0.848-2.543,0.848-5.935c0-1.696,0-0.742,0-0.742V9.479
-		C15.696,8.547,14.933,7.784,14,7.784z"/>
-</g>
-<rect display="none" opacity="0.2" fill="#E94E47" width="28" height="28"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/contextMenu/menu_black_16px.svg b/client/client-editor/src/main/resources/webapp/resources/contextMenu/menu_black_16px.svg
deleted file mode 100644
index f494b6ad1..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/contextMenu/menu_black_16px.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<rect x="3" y="3" width="2" height="2"/>
-<rect x="7" y="3" width="7" height="2"/>
-<rect x="3" y="7" width="2" height="2"/>
-<rect x="7" y="7" width="7" height="2"/>
-<rect x="3" y="11" width="2" height="2"/>
-<rect x="7" y="11" width="7" height="2"/>
-<rect fill="none" width="16" height="16"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/close_exit_icon.svg b/client/client-editor/src/main/resources/webapp/resources/controls/close_exit_icon.svg
deleted file mode 100644
index a950beaff..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/close_exit_icon.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#000000" d="M8,0C3.582,0,0,3.582,0,8c0,4.418,3.582,8,8,8c4.418,0,8-3.582,8-8C16,3.582,12.418,0,8,0z M11.609,10.743
-	l-0.867,0.866c-0.158,0.158-0.418,0.158-0.576,0L8,9.444l-2.166,2.165c-0.159,0.158-0.418,0.158-0.577-0.002l-0.867-0.864
-	c-0.158-0.159-0.158-0.417,0-0.578L6.556,8L4.392,5.836c-0.159-0.16-0.159-0.419,0-0.578l0.866-0.866c0.159-0.16,0.419-0.16,0.577,0
-	L8,6.557l2.166-2.165c0.158-0.16,0.418-0.16,0.576,0l0.867,0.865c0.158,0.159,0.158,0.419,0,0.579L9.443,8l2.166,2.165
-	C11.768,10.326,11.768,10.584,11.609,10.743z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/collapse_icon.svg b/client/client-editor/src/main/resources/webapp/resources/controls/collapse_icon.svg
deleted file mode 100644
index c0d63d8a9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/collapse_icon.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="5px" viewBox="0 0 8 5" enable-background="new 0 0 8 5" xml:space="preserve">
-<defs>
-</defs>
-<polygon fill="#2D2C2C" points="4,1.775 8,5 8,3.226 4,0 0,3.226 0,5 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/down_arrow.svg b/client/client-editor/src/main/resources/webapp/resources/controls/down_arrow.svg
deleted file mode 100644
index eef75155c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/down_arrow.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="5px" viewBox="0 0 8 5" enable-background="new 0 0 8 5" xml:space="preserve">
-<defs>
-</defs>
-<polygon fill="#2D2C2C" points="4,3.225 0,0 0,1.774 4,5 8,1.774 8,0 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/down_arrow_hit.svg b/client/client-editor/src/main/resources/webapp/resources/controls/down_arrow_hit.svg
deleted file mode 100644
index d1d6efda3..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/down_arrow_hit.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="5px" viewBox="0 0 8 5" enable-background="new 0 0 8 5" xml:space="preserve">
-<defs>
-</defs>
-<polygon points="4,3.225 0,0 0,1.774 4,5 8,1.774 8,0 "/>
-</svg>
\ No newline at end of file
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/expand_icon.svg b/client/client-editor/src/main/resources/webapp/resources/controls/expand_icon.svg
deleted file mode 100644
index eef75155c..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/expand_icon.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="5px" viewBox="0 0 8 5" enable-background="new 0 0 8 5" xml:space="preserve">
-<defs>
-</defs>
-<polygon fill="#2D2C2C" points="4,3.225 0,0 0,1.774 4,5 8,1.774 8,0 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/info-black-16x16.svg b/client/client-editor/src/main/resources/webapp/resources/controls/info-black-16x16.svg
deleted file mode 100644
index 1ff8696dc..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/info-black-16x16.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<g>
-		<circle fill="#3D3A39" cx="8" cy="8" r="6.243"/>
-		<path fill="#FFFFFF" d="M8.009,5.21c-0.219,0-0.406-0.067-0.561-0.201C7.293,4.875,7.215,4.685,7.215,4.44
-			c0-0.223,0.08-0.405,0.238-0.55c0.161-0.143,0.345-0.215,0.556-0.215c0.203,0,0.384,0.065,0.54,0.195
-			C8.707,4,8.785,4.19,8.785,4.44c0,0.241-0.076,0.43-0.23,0.566C8.401,5.143,8.22,5.21,8.009,5.21z M8.785,7.222v4.147
-			c0,0.314-0.075,0.553-0.225,0.715c-0.148,0.16-0.34,0.24-0.569,0.24c-0.23,0-0.417-0.082-0.561-0.246s-0.216-0.4-0.216-0.709
-			V7.269c0-0.311,0.072-0.544,0.216-0.702c0.144-0.158,0.33-0.236,0.561-0.236c0.229,0,0.421,0.078,0.569,0.236
-			C8.71,6.724,8.785,6.943,8.785,7.222z"/>
-	</g>
-	<rect x="1.129" y="1.129" fill="none" width="13.742" height="13.742"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/left_arrow.svg b/client/client-editor/src/main/resources/webapp/resources/controls/left_arrow.svg
deleted file mode 100644
index 6f63b937f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/left_arrow.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="9px" height="8px" viewBox="0 0 9 8" enable-background="new 0 0 9 8" xml:space="preserve">
-<defs>
-</defs>
-<polygon fill="#0E68B2" points="5.557,4 9.018,0 7.113,0 3.65,4 7.113,8 9.018,8 "/>
-<rect fill="#0E68B2" width="1.6" height="8"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/left_arrow_.svg b/client/client-editor/src/main/resources/webapp/resources/controls/left_arrow_.svg
deleted file mode 100644
index 11328220e..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/left_arrow_.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="5px" height="8px" viewBox="0 0 5 8" enable-background="new 0 0 5 8" xml:space="preserve">
-<defs>
-</defs>
-<polygon fill="#2D2C2C" points="1.775,4 5,0 3.226,0 0,4 3.226,8 5,8 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/left_arrow_hit.svg b/client/client-editor/src/main/resources/webapp/resources/controls/left_arrow_hit.svg
deleted file mode 100644
index ffaa903c1..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/left_arrow_hit.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="5px" height="8px" viewBox="0 0 5 8" enable-background="new 0 0 5 8" xml:space="preserve">
-<defs>
-</defs>
-<polygon points="1.775,4 5,0 3.226,0 0,4 3.226,8 5,8 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/magnify_black.svg b/client/client-editor/src/main/resources/webapp/resources/controls/magnify_black.svg
deleted file mode 100644
index 024ffe990..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/magnify_black.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<defs>
-</defs>
-<path d="M15.7,13.5l-2.9-2.9c-0.4-0.4-0.9-0.4-1.3-0.2l-0.5-0.5c0.8-1,1.3-2.4,1.3-3.8C12.2,2.7,9.5,0,6.1,0C2.7,0,0,2.7,0,6.1
-	s2.7,6.1,6.1,6.1c1.4,0,2.7-0.5,3.8-1.3l0.5,0.5c-0.2,0.4-0.2,1,0.2,1.3l2.9,2.9c0.4,0.4,1.2,0.4,1.6,0l0.5-0.5
-	C16.1,14.7,16.1,14,15.7,13.5 M1.1,6.1c0-2.8,2.2-5,5-5c2.8,0,5,2.2,5,5c0,2.8-2.2,5-5,5C3.4,11.1,1.1,8.9,1.1,6.1"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/next_arrows_hit.svg b/client/client-editor/src/main/resources/webapp/resources/controls/next_arrows_hit.svg
deleted file mode 100644
index 37dfa00b6..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/next_arrows_hit.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-3.07 -4 16 16" enable-background="new -3.07 -4 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<polygon points="7.941,4 4.718,8 6.491,8 9.718,4 6.491,0 4.718,0 "/>
-<polygon points="3.224,4 0,8 1.773,8 5,4 1.773,0 0,0 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/previous_arrows_hit.svg b/client/client-editor/src/main/resources/webapp/resources/controls/previous_arrows_hit.svg
deleted file mode 100644
index ca8ad0b89..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/previous_arrows_hit.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="16px" height="16px" viewBox="-3.07 -4 16 16" enable-background="new -3.07 -4 16 16"
-	 xml:space="preserve">
-<defs>
-</defs>
-<polygon points="1.776,4 5,0 3.227,0 0,4 3.227,8 5,8 "/>
-<polygon points="6.494,4 9.718,0 7.944,0 4.718,4 7.944,8 9.718,8 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/right_arrow.svg b/client/client-editor/src/main/resources/webapp/resources/controls/right_arrow.svg
deleted file mode 100644
index cdb035271..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/right_arrow.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="9px" height="8px" viewBox="0 0 9 8" enable-background="new 0 0 9 8" xml:space="preserve">
-<defs>
-</defs>
-<polygon fill="#0E68B2" points="3.461,4 0,8 1.904,8 5.367,4 1.904,0 0,0 "/>
-<rect x="7.418" fill="#0E68B2" width="1.6" height="8"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/right_arrow_.svg b/client/client-editor/src/main/resources/webapp/resources/controls/right_arrow_.svg
deleted file mode 100644
index d58c61350..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/right_arrow_.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="5px" height="8px" viewBox="0 0 5 8" enable-background="new 0 0 5 8" xml:space="preserve">
-<defs>
-</defs>
-<polygon fill="#2D2C2C" points="3.225,4 0,8 1.774,8 5,4 1.774,0 0,0 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/right_arrow_hit.svg b/client/client-editor/src/main/resources/webapp/resources/controls/right_arrow_hit.svg
deleted file mode 100644
index 63bfd2746..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/right_arrow_hit.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="8px" viewBox="-1.5 0 8 8" style="enable-background:new -1.5 0 8 8;" xml:space="preserve">
-<defs>
-</defs>
-<polygon points="3.2,4 0,8 1.8,8 5,4 1.8,0 0,0 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/save_black.svg b/client/client-editor/src/main/resources/webapp/resources/controls/save_black.svg
deleted file mode 100644
index 4cbbfc1a9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/save_black.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="12px" height="13px" viewBox="0 0 12 13" style="enable-background:new 0 0 12 13;" xml:space="preserve">
-<defs>
-</defs>
-<path d="M7,3H5V0h2V3z M9,7V6H3v1H9L9,7z M9,9V8H3v1H9L9,9z M12,2.6v10c0,0.2,0,0.4-0.2,0.4H0.4C0.2,13,0,12.8,0,12.6V0.4
-	C0,0.2,0.2,0,0.4,0H2v4h6.4V0h1.2L12,2.6z M10,5H2v6h8V5z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/up_arrow.svg b/client/client-editor/src/main/resources/webapp/resources/controls/up_arrow.svg
deleted file mode 100644
index c0d63d8a9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/up_arrow.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="5px" viewBox="0 0 8 5" enable-background="new 0 0 8 5" xml:space="preserve">
-<defs>
-</defs>
-<polygon fill="#2D2C2C" points="4,1.775 8,5 8,3.226 4,0 0,3.226 0,5 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/controls/up_arrow_hit.svg b/client/client-editor/src/main/resources/webapp/resources/controls/up_arrow_hit.svg
deleted file mode 100644
index 2e2ae5eba..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/controls/up_arrow_hit.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="8px" viewBox="0 -1.5 8 8" style="enable-background:new 0 -1.5 8 8;" xml:space="preserve">
-<defs>
-</defs>
-<polygon points="4,1.8 8,5 8,3.2 4,0 0,3.2 0,5 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/dialogs/confirmation_icon.svg b/client/client-editor/src/main/resources/webapp/resources/dialogs/confirmation_icon.svg
deleted file mode 100644
index 947bd9a14..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/dialogs/confirmation_icon.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="28px" height="28px" viewBox="0 0.001 28 28" enable-background="new 0 0.001 28 28" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#89BA17" d="M14,1.001c-7.179,0-13,5.821-13,13c0,7.179,5.821,13,13,13c7.179,0,13-5.821,13-13
-	C27,6.822,21.179,1.001,14,1.001"/>
-<path fill="#FFFFFF" d="M12.375,20.501c-0.43,0-0.844-0.171-1.149-0.476L6.351,15.15c-0.635-0.634-0.635-1.663,0-2.298
-	s1.663-0.635,2.298,0l3.617,3.617l6.986-8.383c0.573-0.689,1.597-0.783,2.289-0.208c0.689,0.574,0.782,1.599,0.208,2.289
-	l-8.125,9.75c-0.292,0.351-0.718,0.563-1.175,0.583C12.424,20.5,12.399,20.501,12.375,20.501z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="28" height="28"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/dialogs/error_icon.svg b/client/client-editor/src/main/resources/webapp/resources/dialogs/error_icon.svg
deleted file mode 100644
index 9d7d3edd7..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/dialogs/error_icon.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="28px" height="28px" viewBox="0 0.001 28 28" enable-background="new 0 0.001 28 28" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#E32219" d="M14,1.001c-7.179,0-13,5.821-13,13c0,7.179,5.821,13,13,13s13-5.821,13-13C27,6.822,21.179,1.001,14,1.001"
-	/>
-<path fill="#FFFFFF" d="M19.746,17.446c0.636,0.636,0.636,1.664,0,2.298c-0.316,0.317-0.733,0.476-1.148,0.476
-	c-0.416,0-0.832-0.159-1.149-0.476L14,16.298l-3.447,3.447c-0.317,0.317-0.733,0.476-1.149,0.476s-0.83-0.159-1.149-0.476
-	c-0.633-0.635-0.633-1.662,0-2.298l3.447-3.447l-3.447-3.447c-0.633-0.635-0.633-1.663,0-2.298c0.635-0.635,1.665-0.635,2.298,0
-	L14,11.702l3.448-3.447c0.636-0.635,1.662-0.635,2.298,0c0.636,0.635,0.636,1.663,0,2.298l-3.448,3.447L19.746,17.446z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="28" height="28"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/dialogs/information_icon.svg b/client/client-editor/src/main/resources/webapp/resources/dialogs/information_icon.svg
deleted file mode 100644
index 884b16b4a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/dialogs/information_icon.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="28px" height="28px" viewBox="0 0.001 28 28" enable-background="new 0 0.001 28 28" xml:space="preserve">
-<defs>
-</defs>
-<circle fill="#00A9D4" cx="14" cy="14.001" r="13"/>
-<path fill="#FFFFFF" d="M12.375,14.001c0-0.894,0.731-1.625,1.625-1.625l0,0c0.894,0,1.625,0.731,1.625,1.625v6.5
-	c0,0.894-0.731,1.625-1.625,1.625l0,0c-0.894,0-1.625-0.731-1.625-1.625V14.001z"/>
-<path fill="#FFFFFF" d="M12.375,7.176c0-0.715,0.585-1.3,1.3-1.3h0.65c0.715,0,1.3,0.585,1.3,1.3v0.65c0,0.715-0.585,1.3-1.3,1.3
-	h-0.65c-0.715,0-1.3-0.585-1.3-1.3V7.176z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="28" height="28"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/dialogs/warning_icon.svg b/client/client-editor/src/main/resources/webapp/resources/dialogs/warning_icon.svg
deleted file mode 100644
index febd79014..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/dialogs/warning_icon.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="28px" height="28px" viewBox="0 0.001 28 28" enable-background="new 0 0.001 28 28" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#F19619" d="M26.579,25.669c-0.512,0.829-1.414,1.33-2.391,1.33H3.811c-0.975,0-1.878-0.501-2.391-1.33
-	c-0.513-0.826-0.559-1.862-0.123-2.732L11.486,2.856C11.962,1.905,12.938,1.001,14,1.001c1.062,0,2.038,0.904,2.514,1.855
-	l10.188,20.081C27.139,23.807,27.093,24.843,26.579,25.669z"/>
-<path fill="#FFFFFF" d="M15.625,16.111c0,0.626-0.512,1.138-1.138,1.138h-0.975c-0.625,0-1.137-0.512-1.137-1.138V8.636
-	c0-0.625,0.512-1.137,1.137-1.137h0.975c0.625,0,1.138,0.512,1.138,1.137V16.111z"/>
-<path fill="#FFFFFF" d="M15.625,22.611c0,0.626-0.512,1.138-1.138,1.138h-0.975c-0.625,0-1.137-0.512-1.137-1.138v-0.975
-	c0-0.625,0.512-1.137,1.137-1.137h0.975c0.625,0,1.138,0.512,1.138,1.137V22.611z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="28" height="28"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/drilldownPath/arrow.svg b/client/client-editor/src/main/resources/webapp/resources/drilldownPath/arrow.svg
deleted file mode 100644
index 32319b2c7..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/drilldownPath/arrow.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-     viewBox="0 0 8 14.1" enable-background="new 0 0 8 14.1" xml:space="preserve">
-<polyline fill="none" stroke="#8E8E8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
-    1,1 7,7 1.1,13 "/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/form/checkbox_tick.svg b/client/client-editor/src/main/resources/webapp/resources/form/checkbox_tick.svg
deleted file mode 100644
index 877034039..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/form/checkbox_tick.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="8px" viewBox="0 0 8 8" style="enable-background:new 0 0 8 8;" xml:space="preserve">
-<defs>
-</defs>
-<path style="fill:#FFFFFF;" d="M8.1,0.6L7.3,0.1C7.1-0.1,6.9,0,6.7,0.2L3.1,5.6L1.4,3.9c-0.2-0.2-0.5-0.2-0.6,0L0.1,4.5
-	C0,4.7,0,5,0.1,5.2l2.6,2.6C2.9,7.9,3.1,8,3.3,8c0.2,0,0.4-0.1,0.5-0.3l4.4-6.5C8.3,1,8.3,0.7,8.1,0.6z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/form/checkbox_tick_black.svg b/client/client-editor/src/main/resources/webapp/resources/form/checkbox_tick_black.svg
deleted file mode 100644
index 1282819a2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/form/checkbox_tick_black.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="8px" viewBox="0 0 8 8" style="enable-background:new 0 0 8 8;" xml:space="preserve">
-<defs>
-</defs>
-<path d="M8.1,0.6L7.3,0.1C7.1-0.1,6.9,0,6.7,0.2L3.1,5.6L1.4,3.9c-0.2-0.2-0.5-0.2-0.6,0L0.1,4.5C0,4.7,0,5,0.1,5.2l2.6,2.6
-	C2.9,7.9,3.1,8,3.3,8c0.2,0,0.4-0.1,0.5-0.3l4.4-6.5C8.3,1,8.3,0.7,8.1,0.6z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/form/checkbox_tick_green.svg b/client/client-editor/src/main/resources/webapp/resources/form/checkbox_tick_green.svg
deleted file mode 100644
index 8c8ee47e4..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/form/checkbox_tick_green.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="8px" viewBox="0 0 8 8" style="enable-background:new 0 0 8 8;" xml:space="preserve">
-<defs>
-</defs>
-<path style="fill:#89BA17;" d="M8.1,0.6L7.3,0.1C7.1-0.1,6.9,0,6.7,0.2L3.1,5.6L1.4,3.9c-0.2-0.2-0.5-0.2-0.6,0L0.1,4.5
-	C0,4.7,0,5,0.1,5.2l2.6,2.6C2.9,7.9,3.1,8,3.3,8c0.2,0,0.4-0.1,0.5-0.3l4.4-6.5C8.3,1,8.3,0.7,8.1,0.6z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/form/checkbox_triple.svg b/client/client-editor/src/main/resources/webapp/resources/form/checkbox_triple.svg
deleted file mode 100644
index 06f9dd7e2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/form/checkbox_triple.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="6px" height="2px" viewBox="0 0 6 2" enable-background="new 0 0 6 2" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#0967B2" width="6" height="2"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/form/checkbox_triple_black.svg b/client/client-editor/src/main/resources/webapp/resources/form/checkbox_triple_black.svg
deleted file mode 100644
index 3a719427f..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/form/checkbox_triple_black.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="6px" height="2px" viewBox="0 0 6 2" enable-background="new 0 0 6 2" xml:space="preserve">
-<defs>
-</defs>
-<rect width="6" height="2"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/form/checkbox_triple_green.svg b/client/client-editor/src/main/resources/webapp/resources/form/checkbox_triple_green.svg
deleted file mode 100644
index ea37be0d9..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/form/checkbox_triple_green.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="6px" height="2px" viewBox="0 0 6 2" enable-background="new 0 0 6 2" xml:space="preserve">
-<defs>
-</defs>
-<rect fill="#89BA17" width="6" height="2"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/form/invalid_icon.svg b/client/client-editor/src/main/resources/webapp/resources/form/invalid_icon.svg
deleted file mode 100644
index c7fc9c2c2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/form/invalid_icon.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#E32219" d="M8.571,0H1.429C0.643,0,0,0.643,0,1.432v7.136C0,9.355,0.643,10,1.429,10h7.142C9.357,10,10,9.355,10,8.568
-	V1.432C10,0.643,9.357,0,8.571,0"/>
-<path fill="#FFFFFF" d="M6,5.272C6,5.674,5.552,6,5,6l0,0C4.448,6,4,5.674,4,5.272V1.728C4,1.326,4.448,1,5,1l0,0
-	c0.552,0,1,0.326,1,0.728V5.272z"/>
-<circle fill="#FFFFFF" cx="5" cy="8" r="1"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/form/radio_tick_black.svg b/client/client-editor/src/main/resources/webapp/resources/form/radio_tick_black.svg
deleted file mode 100644
index 47a746593..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/form/radio_tick_black.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="8px" viewBox="0 0 8 8" enable-background="new 0 0 8 8" xml:space="preserve">
-<defs>
-</defs>
-<g>
-	<g>
-		<path fill="#000000" d="m0,3.98571c0,2.13714 1.8,3.88571 4,3.88571s4,-1.74857 4,-3.88571s-1.8,-3.88571 -4,-3.88571s-4,1.74857 -4,3.88571z"/>
-	</g>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/form/radio_tick_green.svg b/client/client-editor/src/main/resources/webapp/resources/form/radio_tick_green.svg
deleted file mode 100644
index 63b923b43..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/form/radio_tick_green.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="8px" viewBox="0 0 8 8" enable-background="new 0 0 8 8" xml:space="preserve">
-<defs>
-</defs>
-<g>
-	<g>
-		<path fill="#89BA17" d="m0,3.98571c0,2.13714 1.8,3.88571 4,3.88571s4,-1.74857 4,-3.88571s-1.8,-3.88571 -4,-3.88571s-4,1.74857 -4,3.88571z"/>
-	</g>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/form/valid_icon.svg b/client/client-editor/src/main/resources/webapp/resources/form/valid_icon.svg
deleted file mode 100644
index 5ccc9c812..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/form/valid_icon.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#89BA17" d="M8.57,0H1.429C0.643,0,0,0.643,0,1.432v7.136C0,9.355,0.643,10,1.429,10H8.57C9.357,10,10,9.355,10,8.568
-	V1.432C10,0.643,9.357,0,8.57,0"/>
-<path fill="#FFFFFF" d="M4.3,8C4.115,8,3.937,7.922,3.805,7.78l-2.1-2.25c-0.273-0.293-0.273-0.767,0-1.06s0.717-0.293,0.99,0
-	L4.253,6.14l3.01-3.869C7.51,1.952,7.951,1.908,8.248,2.174C8.545,2.439,8.586,2.912,8.337,3.23l-3.5,4.5
-	C4.712,7.893,4.528,7.99,4.331,7.999C4.321,8,4.311,8,4.3,8"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/other/ArrowDoubleLeft_black_10x8px.svg b/client/client-editor/src/main/resources/webapp/resources/other/ArrowDoubleLeft_black_10x8px.svg
deleted file mode 100644
index dd5fea140..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/other/ArrowDoubleLeft_black_10x8px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="8px" viewBox="0 0.001 10 8" enable-background="new 0 0.001 10 8" xml:space="preserve">
-<defs>
-</defs>
-<path d="M3.293,7.708l-3-3C0.098,4.513,0,4.257,0,4.001S0.098,3.49,0.293,3.294l3-3c0.391-0.391,1.023-0.391,1.414,0
-	s0.391,1.023,0,1.414L2.414,4.001l2.293,2.293c0.391,0.391,0.391,1.023,0,1.414S3.684,8.099,3.293,7.708z"/>
-<path d="M8.293,7.708l-3-3C5.098,4.513,5,4.257,5,4.001S5.098,3.49,5.293,3.294l3-3c0.391-0.391,1.023-0.391,1.414,0
-	s0.391,1.023,0,1.414L7.414,4.001l2.293,2.293c0.391,0.391,0.391,1.023,0,1.414S8.684,8.099,8.293,7.708z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="10" height="8"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/other/ArrowDoubleRight_black_10x8px.svg b/client/client-editor/src/main/resources/webapp/resources/other/ArrowDoubleRight_black_10x8px.svg
deleted file mode 100644
index 9dee01786..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/other/ArrowDoubleRight_black_10x8px.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="8px" viewBox="0 0.001 10 8" enable-background="new 0 0.001 10 8" xml:space="preserve">
-<defs>
-</defs>
-<path d="M6.707,0.294l3,3C9.902,3.49,10,3.745,10,4.001S9.902,4.513,9.707,4.708l-3,3c-0.391,0.391-1.023,0.391-1.414,0
-	s-0.391-1.023,0-1.414l2.293-2.293L5.293,1.708c-0.391-0.391-0.391-1.023,0-1.414S6.316-0.096,6.707,0.294z"/>
-<path d="M1.707,0.294l3,3C4.902,3.49,5,3.745,5,4.001S4.902,4.513,4.707,4.708l-3,3c-0.391,0.391-1.023,0.391-1.414,0
-	s-0.391-1.023,0-1.414l2.293-2.293L0.293,1.708c-0.391-0.391-0.391-1.023,0-1.414S1.316-0.096,1.707,0.294z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="10" height="8"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/other/ArrowDown_black_8x5px.svg b/client/client-editor/src/main/resources/webapp/resources/other/ArrowDown_black_8x5px.svg
deleted file mode 100644
index 0cac0d549..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/other/ArrowDown_black_8x5px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="5px" viewBox="0 0.001 8 5" enable-background="new 0 0.001 8 5" xml:space="preserve">
-<defs>
-</defs>
-<path d="M7.707,1.708l-3,2.999C4.512,4.902,4.256,5,4,5S3.488,4.902,3.293,4.707l-3-2.999c-0.391-0.391-0.391-1.023,0-1.414
-	s1.023-0.391,1.414,0L4,2.587l2.293-2.293c0.391-0.391,1.023-0.391,1.414,0S8.098,1.318,7.707,1.708z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="8" height="5"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/other/ArrowLeft_black_5x8px.svg b/client/client-editor/src/main/resources/webapp/resources/other/ArrowLeft_black_5x8px.svg
deleted file mode 100644
index a3f5ca5a2..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/other/ArrowLeft_black_5x8px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="5px" height="8px" viewBox="0 0.001 5 8" enable-background="new 0 0.001 5 8" xml:space="preserve">
-<defs>
-</defs>
-<path d="M3.293,7.708l-3-3C0.098,4.513,0,4.257,0,4.001S0.098,3.49,0.293,3.294l3-3c0.391-0.391,1.023-0.391,1.414,0
-	s0.391,1.023,0,1.414L2.414,4.001l2.293,2.293c0.391,0.391,0.391,1.023,0,1.414S3.684,8.099,3.293,7.708z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="5" height="8"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/other/ArrowRight_black_5x8px.svg b/client/client-editor/src/main/resources/webapp/resources/other/ArrowRight_black_5x8px.svg
deleted file mode 100644
index e6724bcdb..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/other/ArrowRight_black_5x8px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="5px" height="8px" viewBox="0 0.001 5 8" enable-background="new 0 0.001 5 8" xml:space="preserve">
-<defs>
-</defs>
-<path d="M1.707,0.294l3,3C4.902,3.49,5,3.745,5,4.001S4.902,4.513,4.707,4.708l-3,3c-0.391,0.391-1.023,0.391-1.414,0
-	s-0.391-1.023,0-1.414l2.293-2.293L0.293,1.708c-0.391-0.391-0.391-1.023,0-1.414S1.316-0.096,1.707,0.294z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="5" height="8"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/other/ArrowUp_black_8x5px.svg b/client/client-editor/src/main/resources/webapp/resources/other/ArrowUp_black_8x5px.svg
deleted file mode 100644
index 02ae9cd60..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/other/ArrowUp_black_8x5px.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="8px" height="5px" viewBox="0 0.001 8 5" enable-background="new 0 0.001 8 5" xml:space="preserve">
-<defs>
-</defs>
-<path d="M0.293,3.294l3-3C3.488,0.099,3.744,0.001,4,0.001s0.512,0.098,0.707,0.293l3,3c0.391,0.391,0.391,1.023,0,1.414
-	s-1.023,0.391-1.414,0L4,2.415L1.707,4.708c-0.391,0.391-1.023,0.391-1.414,0S-0.098,3.685,0.293,3.294z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="8" height="5"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/other/errorSmall_red_10px.svg b/client/client-editor/src/main/resources/webapp/resources/other/errorSmall_red_10px.svg
deleted file mode 100644
index fdb4e8c2a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/other/errorSmall_red_10px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="10px" viewBox="0 0.001 10 10" enable-background="new 0 0.001 10 10" xml:space="preserve">
-<defs>
-</defs>
-<circle fill="#E32219" cx="5" cy="5.001" r="5"/>
-<path fill="#FFFFFF" d="M6.677,7.801L5.013,6.137L3.336,7.814L2.187,6.665l1.678-1.677L2.199,3.323l1.118-1.118l1.665,1.664
-	l1.682-1.682l1.149,1.149L6.131,5.018l1.664,1.665L6.677,7.801z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="10" height="10"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/other/tick_black_10x8px.svg b/client/client-editor/src/main/resources/webapp/resources/other/tick_black_10x8px.svg
deleted file mode 100644
index 5a00974db..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/other/tick_black_10x8px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="8px" viewBox="0 0.001 10 8" enable-background="new 0 0.001 10 8" xml:space="preserve">
-<defs>
-</defs>
-<path d="M4,8C3.735,8,3.48,7.896,3.293,7.708l-3-3c-0.391-0.391-0.391-1.024,0-1.414c0.391-0.39,1.023-0.39,1.414,0L3.933,5.52
-	l4.299-5.159c0.354-0.424,0.982-0.482,1.409-0.128c0.424,0.354,0.481,0.984,0.128,1.408l-5,6C4.588,7.857,4.326,7.986,4.045,7.999
-	C4.03,8,4.015,8,4,8z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="10" height="8"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/other/tick_green_10x8px.svg b/client/client-editor/src/main/resources/webapp/resources/other/tick_green_10x8px.svg
deleted file mode 100644
index 257b5b039..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/other/tick_green_10x8px.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="10px" height="8px" viewBox="0 0.001 10 8" enable-background="new 0 0.001 10 8" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#89BA17" d="M4,8C3.735,8,3.48,7.896,3.293,7.708l-3-3c-0.391-0.391-0.391-1.024,0-1.414c0.391-0.39,1.023-0.39,1.414,0
-	L3.933,5.52l4.299-5.159c0.354-0.424,0.983-0.482,1.409-0.128c0.424,0.354,0.481,0.984,0.128,1.408l-5,6
-	C4.588,7.857,4.326,7.986,4.045,7.999C4.03,8,4.015,8,4,8z"/>
-<rect display="none" opacity="0.2" fill="#E94E47" width="10" height="8"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/pagination/pagination_end.svg b/client/client-editor/src/main/resources/webapp/resources/pagination/pagination_end.svg
deleted file mode 100644
index 1818acd06..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/pagination/pagination_end.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="8px" height="8px" viewBox="0 0 8 8" enable-background="new 0 0 8 8" xml:space="preserve">
-<polygon fill="#0E68B2" points="3.224,4 0,8 1.774,8 5,4 1.774,0 0,0 "/>
-<rect x="6.6" fill="#0E68B2" width="1.4" height="8"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/pagination/pagination_next.svg b/client/client-editor/src/main/resources/webapp/resources/pagination/pagination_next.svg
deleted file mode 100644
index e2fb84852..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/pagination/pagination_next.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="5px" height="8px" viewBox="0 0 5 8" enable-background="new 0 0 5 8" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#0066B3" d="M1.707,0.293l3,3C4.902,3.488,5,3.744,5,4S4.902,4.512,4.707,4.707l-3,3c-0.391,0.391-1.023,0.391-1.414,0
-	s-0.391-1.023,0-1.414L2.586,4L0.293,1.707c-0.391-0.391-0.391-1.023,0-1.414S1.316-0.098,1.707,0.293z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/pagination/pagination_previous.svg b/client/client-editor/src/main/resources/webapp/resources/pagination/pagination_previous.svg
deleted file mode 100644
index 44d3d6bca..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/pagination/pagination_previous.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="5px" height="8px" viewBox="0 -0.001 5 8" enable-background="new 0 -0.001 5 8" xml:space="preserve">
-<defs>
-</defs>
-<path fill="#0066B3" d="M3.292,7.708l-3-3C0.098,4.512,0,4.256,0,4c0-0.255,0.098-0.511,0.293-0.707l3-3
-	c0.391-0.391,1.023-0.391,1.413,0c0.392,0.391,0.392,1.023,0,1.414L2.414,4l2.292,2.292c0.392,0.392,0.391,1.024,0,1.415
-	C4.317,8.097,3.684,8.098,3.292,7.708z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/pagination/pagination_start.svg b/client/client-editor/src/main/resources/webapp/resources/pagination/pagination_start.svg
deleted file mode 100644
index f84f73edd..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/pagination/pagination_start.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="8px" height="8px" viewBox="0 0 8 8" enable-background="new 0 0 8 8" xml:space="preserve">
-<polygon fill="#0E68B2" points="4.775,4 8,0 6.227,0 3,4 6.227,8 8,8 "/>
-<rect fill="#0E68B2" width="1.4" height="8"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/systemBar/help_black.svg b/client/client-editor/src/main/resources/webapp/resources/systemBar/help_black.svg
deleted file mode 100644
index 14fdf5d35..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/systemBar/help_black.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path fill="#1D1D1B" d="M8,0C3.582,0,0,3.582,0,8s3.582,8,8,8s8-3.582,8-8S12.418,0,8,0z M8.608,12.149
-	c-0.205,0.183-0.442,0.273-0.711,0.273c-0.277,0-0.521-0.09-0.728-0.27c-0.207-0.181-0.311-0.433-0.311-0.756
-	c0-0.287,0.101-0.528,0.3-0.724c0.201-0.196,0.447-0.295,0.738-0.295c0.287,0,0.529,0.099,0.725,0.295
-	c0.196,0.195,0.295,0.437,0.295,0.724C8.917,11.717,8.813,11.967,8.608,12.149z M10.46,6.227c-0.123,0.229-0.27,0.427-0.439,0.594
-	C9.85,6.986,9.545,7.267,9.104,7.661c-0.122,0.111-0.22,0.208-0.293,0.292C8.738,8.038,8.684,8.114,8.647,8.185
-	c-0.036,0.069-0.063,0.14-0.083,0.209c-0.02,0.07-0.049,0.193-0.089,0.368C8.408,9.135,8.194,9.32,7.837,9.32
-	c-0.187,0-0.343-0.061-0.47-0.183C7.239,9.016,7.176,8.835,7.176,8.595c0-0.301,0.047-0.561,0.14-0.782
-	c0.093-0.22,0.217-0.413,0.371-0.58C7.84,7.067,8.048,6.869,8.31,6.64c0.229-0.201,0.395-0.352,0.497-0.454
-	c0.102-0.103,0.188-0.216,0.257-0.341c0.07-0.125,0.105-0.261,0.105-0.408c0-0.287-0.107-0.528-0.32-0.725S8.361,4.417,8.024,4.417
-	c-0.394,0-0.684,0.099-0.87,0.298C6.968,4.913,6.811,5.206,6.682,5.593C6.56,5.998,6.329,6.2,5.989,6.2
-	c-0.201,0-0.37-0.071-0.508-0.212C5.344,5.846,5.274,5.693,5.274,5.528c0-0.34,0.109-0.685,0.328-1.034
-	C5.82,4.146,6.14,3.856,6.559,3.627s0.907-0.344,1.466-0.344c0.52,0,0.978,0.096,1.375,0.287c0.397,0.192,0.705,0.452,0.922,0.782
-	c0.216,0.33,0.324,0.688,0.324,1.074C10.646,5.73,10.584,5.998,10.46,6.227z"/>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/systemBar/logout_black.svg b/client/client-editor/src/main/resources/webapp/resources/systemBar/logout_black.svg
deleted file mode 100644
index af297acde..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/systemBar/logout_black.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M10.77,12.455c0,0-0.684,0.192-0.684-0.684c0-0.199,0-0.861,0-1.711H5.98
-			c-0.377,0-0.684-0.308-0.684-0.684V6.639c0-0.377,0.307-0.684,0.684-0.684h4.106c0-0.818,0-1.475,0-1.732
-			c0-0.919,0.684-0.662,0.684-0.662l5.133,4.447L10.77,12.455z"/>
-	</g>
-	<path fill="#1D1D1B" d="M9.85,14H3.099c-0.551,0-1-0.447-1-1V3c0-0.552,0.449-1,1-1H9.85V0H3.099c-1.656,0-3,1.344-3,3v10
-		c0,1.656,1.344,3,3,3H9.85V14z"/>
-</g>
-</svg>
diff --git a/client/client-editor/src/main/resources/webapp/resources/whitelabel/button.png b/client/client-editor/src/main/resources/webapp/resources/whitelabel/button.png
deleted file mode 100644
index 15aa1a9ec..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/whitelabel/button.png
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/resources/whitelabel/pagecustomization.PNG b/client/client-editor/src/main/resources/webapp/resources/whitelabel/pagecustomization.PNG
deleted file mode 100644
index 6764117a3..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/whitelabel/pagecustomization.PNG
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/resources/whitelabel/systembar.png b/client/client-editor/src/main/resources/webapp/resources/whitelabel/systembar.png
deleted file mode 100644
index 32b86de5a..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/whitelabel/systembar.png
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/resources/whitelabel/table.png b/client/client-editor/src/main/resources/webapp/resources/whitelabel/table.png
deleted file mode 100644
index edc7b4518..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/whitelabel/table.png
+++ /dev/null
diff --git a/client/client-editor/src/main/resources/webapp/resources/whitelabel/typography.png b/client/client-editor/src/main/resources/webapp/resources/whitelabel/typography.png
deleted file mode 100644
index ab97b3b36..000000000
--- a/client/client-editor/src/main/resources/webapp/resources/whitelabel/typography.png
+++ /dev/null
diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ApexEditorStartupTest.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ApexEditorStartupTest.java
deleted file mode 100644
index 4d6c93222..000000000
--- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ApexEditorStartupTest.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.awaitility.Awaitility.await;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.concurrent.TimeUnit;
-import org.junit.Test;
-import org.onap.policy.apex.client.editor.rest.ApexEditorMain.EditorState;
-
-/**
- * Test Apex Editor Startup.
- */
-public class ApexEditorStartupTest {
-    // CHECKSTYLE:OFF: MagicNumber
-
-    /**
-     * Test no args.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testNoArgs() throws IOException, InterruptedException {
-        final String[] args = new String[] {};
-
-        final String outString = runEditor(args);
-        assertTrue(outString.startsWith("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:18989/apexservices/, TTL=-1sec], "
-                + "State=READY) starting at http://localhost:18989/apexservices/"));
-        assertTrue(outString.contains("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:18989/apexservices/, TTL=-1sec], "
-                + "State=RUNNING) started at http://localhost:18989/apexservices/"));
-        assertTrue(outString.replaceAll("[\\r?\\n]+", " ").endsWith("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:18989/apexservices/, TTL=-1sec],"
-                + " State=STOPPED) shut down "));
-    }
-
-    /**
-     * Test bad arg 0.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testBadArg0() throws IOException, InterruptedException {
-        final String[] args = new String[] { "12321" };
-
-        assertThatThrownBy(() -> runEditor(args)).isInstanceOf(ApexEditorParameterException.class)
-            .hasMessageContaining("Apex Editor REST endpoint (ApexEditorMain: Config=[null], State=STOPPED)"
-                + " parameter error, too many command line arguments specified : [12321]");
-    }
-
-    /**
-     * Test bad arg 1.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testBadArg1() throws IOException, InterruptedException {
-        final String[] args = new String[] { "12321 12322 12323" };
-
-        assertThatThrownBy(() -> runEditor(args)).isInstanceOf(ApexEditorParameterException.class)
-            .hasMessageContaining("Apex Editor REST endpoint (ApexEditorMain: Config=[null], State=STOPPED)"
-                    + " parameter error, too many command line arguments specified : [12321 12322 12323]");
-    }
-
-    /**
-     * Test bad arg 2.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testBadArg2() throws IOException, InterruptedException {
-        final String[] args = new String[] { "-z" };
-
-        assertThatThrownBy(() -> runEditor(args)).isInstanceOf(ApexEditorParameterException.class)
-            .hasMessageContaining("Apex Editor REST endpoint (ApexEditorMain: Config=[null], State=STOPPED)"
-                    + " parameter error, invalid command line arguments specified : Unrecognized option: -z");
-    }
-
-    /**
-     * Test bad arg 3.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testBadArg3() throws IOException, InterruptedException {
-        final String[] args = new String[] { "--hello" };
-
-        assertThatThrownBy(() -> runEditor(args)).isInstanceOf(ApexEditorParameterException.class)
-            .hasMessageContaining("Apex Editor REST endpoint (ApexEditorMain: Config=[null], State=STOPPED)"
-                    + " parameter error, invalid command line arguments specified : Unrecognized option: --hello");
-    }
-
-
-    /**
-     * Test bad arg 4.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testBadArg4() throws IOException, InterruptedException {
-        final String[] args = new String[] { "-l", "+++++" };
-
-        assertThatThrownBy(() -> runEditor(args)).isInstanceOf(ApexEditorParameterException.class)
-            .hasMessageContaining("Apex Editor REST endpoint (ApexEditorMain: "
-                            + "Config=[ApexEditorParameters: URI=http://+++++:18989/apexservices/, TTL=-1sec], "
-                            + "State=STOPPED) parameters invalid, listen address is not valid. "
-                            + "Illegal character in hostname at index 7: http://+++++:18989/apexservices/");
-    }
-
-    /**
-     * Test help 0.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testHelp0() throws IOException, InterruptedException {
-        final String[] args = new String[] { "--help" };
-
-        assertThatThrownBy(() -> runEditor(args)).isInstanceOf(ApexEditorParameterException.class)
-            .hasMessageContaining("usage: org.onap.policy.apex.client.editor.rest.ApexEditorMain [options...]");
-    }
-
-    /**
-     * Test help 1.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testHelp1() throws IOException, InterruptedException {
-        final String[] args = new String[] { "-h" };
-
-        assertThatThrownBy(() -> runEditor(args)).isInstanceOf(ApexEditorParameterException.class)
-            .hasMessageContaining("usage: org.onap.policy.apex.client.editor.rest.ApexEditorMain [options...]");
-    }
-
-    /**
-     * Test port arg.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testPortArgShJo() throws IOException, InterruptedException {
-        final String[] args = new String[] { "-p12321" };
-
-        final String outString = runEditor(args);
-
-        assertTrue(outString.startsWith("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:12321/apexservices/, TTL=-1sec], "
-                + "State=READY) starting at http://localhost:12321/apexservices/"));
-        assertTrue(outString.contains("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:12321/apexservices/, TTL=-1sec], "
-                + "State=RUNNING) started at http://localhost:12321/apexservices/"));
-        assertTrue(outString.replaceAll("[\\r?\\n]+", " ").endsWith("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:12321/apexservices/, TTL=-1sec],"
-                + " State=STOPPED) shut down "));
-    }
-
-    /**
-     * Test port arg.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testPortArgShSe() throws IOException, InterruptedException {
-        final String[] args = new String[] { "-p", "12321" };
-
-        final String outString = runEditor(args);
-
-        assertTrue(outString.startsWith("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:12321/apexservices/, TTL=-1sec], "
-                + "State=READY) starting at http://localhost:12321/apexservices/"));
-        assertTrue(outString.contains("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:12321/apexservices/, TTL=-1sec], "
-                + "State=RUNNING) started at http://localhost:12321/apexservices/"));
-        assertTrue(outString.replaceAll("[\\r?\\n]+", " ").endsWith("(ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:12321/apexservices/, TTL=-1sec],"
-                + " State=STOPPED) shut down "));
-    }
-
-
-    /**
-     * Test port arg.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testPortArgSpace() throws IOException, InterruptedException {
-        final String[] args = new String[] { "-p 12321" };
-
-        assertThatThrownBy(() -> runEditor(args)).isInstanceOf(ApexEditorParameterException.class)
-            .hasMessageContaining("Apex Editor REST endpoint (ApexEditorMain: Config=[null], State=STOPPED)"
-                    + " parameter error, error parsing argument \"port\" :For input string: \" 12321\"");
-    }
-
-    /**
-     * Test bad port arg 0.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testBadPortArgs0() throws IOException, InterruptedException {
-        final String[] args = new String[] { "-p0" };
-
-        assertThatThrownBy(() -> runEditor(args)).isInstanceOf(ApexEditorParameterException.class)
-            .hasMessageContaining("Apex Editor REST endpoint (ApexEditorMain: "
-                            + "Config=[ApexEditorParameters: URI=http://localhost:0/apexservices/, TTL=-1sec], "
-                            + "State=STOPPED) parameters invalid, port must be between 1024 and 65535");
-    }
-
-    /**
-     * Test bad port arg 1023.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testBadPortArgs1023() throws IOException, InterruptedException {
-        final String[] args = new String[] { "-p1023" };
-
-        assertThatThrownBy(() -> runEditor(args)).isInstanceOf(ApexEditorParameterException.class)
-            .hasMessageContaining("Apex Editor REST endpoint (ApexEditorMain: "
-                            + "Config=[ApexEditorParameters: URI=http://localhost:1023/apexservices/, TTL=-1sec], "
-                            + "State=STOPPED) parameters invalid, port must be between 1024 and 65535");
-    }
-
-    /**
-     * Test bad port arg 65536.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testBadPortArgs65536() throws IOException, InterruptedException {
-        final String[] args = new String[] { "-p65536" };
-
-        assertThatThrownBy(() -> runEditor(args)).isInstanceOf(ApexEditorParameterException.class)
-            .hasMessageContaining("Apex Editor REST endpoint (ApexEditorMain: "
-                            + "Config=[ApexEditorParameters: URI=http://localhost:65536/apexservices/, TTL=-1sec], "
-                            + "State=STOPPED) parameters invalid, port must be between 1024 and 65535");
-    }
-
-    /**
-     * Test TTL arg 0.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testTtlArg0() throws IOException, InterruptedException {
-        final String[] args = new String[] { "-t10" };
-
-        final String outString = runEditor(args);
-
-        assertTrue(outString.startsWith("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:18989/apexservices/, TTL=10sec], "
-                + "State=READY) starting at http://localhost:18989/apexservices/"));
-        assertTrue(outString.replaceAll("[\\r?\\n]+", " ").contains("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:18989/apexservices/, TTL=10sec], State=RUNNING)"
-                + " started"));
-        assertTrue(outString.replaceAll("[\\r?\\n]+", " ").endsWith("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:18989/apexservices/, TTL=10sec], State=STOPPED)"
-                + " shut down "));
-    }
-
-    /**
-     * Test TTL arg 10.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testTtlArg1() throws IOException, InterruptedException {
-        final String[] args = new String[] { "-t", "10", "-l", "localhost" };
-
-        final String outString = runEditor(args);
-
-        assertTrue(outString.startsWith("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:18989/apexservices/, TTL=10sec], "
-                + "State=READY) starting at http://localhost:18989/apexservices/"));
-        assertTrue(outString.replaceAll("[\\r?\\n]+", " ").contains("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:18989/apexservices/, TTL=10sec], State=RUNNING)"
-                + " started"));
-        assertTrue(outString.replaceAll("[\\r?\\n]+", " ").endsWith("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:18989/apexservices/, TTL=10sec], State=STOPPED)"
-                + " shut down "));
-    }
-
-    /**
-     * Test port TTL arg 0.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testPortTtlArg0() throws IOException, InterruptedException {
-        final String[] args = new String[] { "-t", "10", "-p", "12321" };
-
-        final String outString = runEditor(args);
-
-        assertTrue(outString.startsWith("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:12321/apexservices/, TTL=10sec], "
-                + "State=READY) starting at http://localhost:12321/apexservices/"));
-        assertTrue(outString.replaceAll("[\\r?\\n]+", " ").contains("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:12321/apexservices/, TTL=10sec], State=RUNNING)"
-                + " started"));
-        assertTrue(outString.replaceAll("[\\r?\\n]+", " ").endsWith("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://localhost:12321/apexservices/, TTL=10sec], State=STOPPED)"
-                + " shut down "));
-    }
-
-
-    /**
-     * Test port TTL arg 10.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException if the test is interrupted
-     */
-    @Test
-    public void testPortTtlArg1() throws IOException, InterruptedException {
-        final String[] args = new String[] { "--time-to-live", "10", "--port", "12321", "--listen", "127.0.0.1" };
-
-        final String outString = runEditor(args);
-
-        assertTrue(outString.startsWith("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://127.0.0.1:12321/apexservices/, TTL=10sec], "
-                + "State=READY) starting at http://127.0.0.1:12321/apexservices/"));
-        assertTrue(outString.replaceAll("[\\r?\\n]+", " ").contains("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://127.0.0.1:12321/apexservices/, TTL=10sec], State=RUNNING)"
-                + " started"));
-        assertTrue(outString.replaceAll("[\\r?\\n]+", " ").endsWith("Apex Editor REST endpoint (ApexEditorMain: "
-                + "Config=[ApexEditorParameters: URI=http://127.0.0.1:12321/apexservices/, TTL=10sec], State=STOPPED)"
-                + " shut down "));
-    }
-
-    /**
-     * Run the editor for tests.
-     *
-     * @param args the args
-     * @return the output string
-     * @throws InterruptedException if the test is interrupted
-     */
-    private String runEditor(final String[] args) throws InterruptedException {
-        final ByteArrayOutputStream outBaStream = new ByteArrayOutputStream();
-        final PrintStream outStream = new PrintStream(outBaStream);
-
-        final ApexEditorMain editorMain = new ApexEditorMain(args, outStream);
-
-        // This test must be started in a thread because we want to intercept the output in cases where the editor is
-        // started infinitely
-        final Runnable testThread = new Runnable() {
-            @Override
-            public void run() {
-                editorMain.init();
-            }
-        };
-        new Thread(testThread).start();
-        await().atMost(15000, TimeUnit.MILLISECONDS).until(() -> !(editorMain.getState().equals(EditorState.READY)
-                || editorMain.getState().equals(EditorState.INITIALIZING)));
-        editorMain.shutdown();
-        final String outString = outBaStream.toString();
-        System.out.println(outString);
-        return outString;
-    }
-}
diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ExceptionsTest.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ExceptionsTest.java
deleted file mode 100644
index cbe0e4b58..000000000
--- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/ExceptionsTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-import org.junit.Test;
-
-/**
- * Test Apex Editor Exceptions.
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ExceptionsTest {
-
-    @Test
-    public void test() {
-        assertNotNull(new ApexEditorException("Message"));
-        assertNotNull(new ApexEditorException("Message", "Object of Exception"));
-        assertNotNull(new ApexEditorException("Message", new IOException()));
-        assertNotNull(new ApexEditorException("Message", new IOException(), "Object of Exception"));
-    }
-}
diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/RestInterfaceTest.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/RestInterfaceTest.java
deleted file mode 100644
index a5ba0f44b..000000000
--- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/RestInterfaceTest.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest;
-
-import static org.awaitility.Awaitility.await;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.concurrent.TimeUnit;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.xml.bind.JAXBException;
-import org.eclipse.persistence.jpa.jpql.Assert;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.policy.apex.client.editor.rest.ApexEditorMain.EditorState;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelReader;
-import org.onap.policy.apex.model.basicmodel.handling.ApexModelStringWriter;
-import org.onap.policy.apex.model.modelapi.ApexApiResult;
-import org.onap.policy.apex.model.policymodel.concepts.AxPolicy;
-import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
-import org.onap.policy.common.utils.resources.ResourceUtils;
-
-/**
- * The RestInterface Test.
- */
-public class RestInterfaceTest {
-    // CHECKSTYLE:OFF: MagicNumber
-
-    private static final String TESTMODELFILE = "models/PolicyModel.json";
-    private static final String TESTPORTNUM = "18989";
-    private static final long MAX_WAIT = 15000; // 15 sec
-    private static final InputStream SYSIN = System.in;
-    private static final String[] EDITOR_MAIN_ARGS = new String[] { "-p", TESTPORTNUM };
-
-    private static ApexEditorMain editorMain;
-    private static WebTarget target;
-
-    private static AxPolicyModel localmodel = null;
-    private static String localmodelString = null;
-
-    /**
-     * Sets up the tests.
-     *
-     * @throws Exception if an error happens
-     */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        // Start the editor
-        editorMain = new ApexEditorMain(EDITOR_MAIN_ARGS, System.out);
-        // prevent a stray stdin value from killing the editor
-        final ByteArrayInputStream input = new ByteArrayInputStream("".getBytes());
-        System.setIn(input);
-        // Init the editor in a separate thread
-        final Runnable testThread = new Runnable() {
-            @Override
-            public void run() {
-                editorMain.init();
-            }
-        };
-        new Thread(testThread).start();
-        // wait until editorMain is in state RUNNING
-        await().atMost(MAX_WAIT, TimeUnit.MILLISECONDS).until(() -> !(editorMain.getState().equals(EditorState.READY)
-                || editorMain.getState().equals(EditorState.INITIALIZING)));
-
-        if (editorMain.getState().equals(EditorState.STOPPED)) {
-            Assert.fail("Rest endpoint (" + editorMain + ") shut down before it could be used");
-        }
-
-        // create the client
-        final Client c = ClientBuilder.newClient();
-        // Create the web target
-        target = c.target(new ApexEditorParameters().getBaseUri());
-
-        // load a test model locally
-        localmodel = new ApexModelReader<>(AxPolicyModel.class, false)
-                .read(ResourceUtils.getResourceAsStream(TESTMODELFILE));
-        localmodelString =
-                new ApexModelStringWriter<AxPolicyModel>(false).writeJsonString(localmodel, AxPolicyModel.class);
-
-        // initialize a session ID
-        createNewSession();
-    }
-
-    /**
-     * Clean up streams.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws InterruptedException the interrupted exception
-     */
-    @AfterClass
-    public static void cleanUpStreams() throws IOException, InterruptedException {
-        editorMain.shutdown();
-        // wait until editorMain is in state STOPPED
-        await().atMost(MAX_WAIT, TimeUnit.MILLISECONDS).until(() -> editorMain.getState().equals(EditorState.STOPPED));
-        System.setIn(SYSIN);
-    }
-
-    /**
-     * Test to see that the message create Model with model id -1 .
-     */
-    @Test
-    public void createSession() {
-        createNewSession();
-    }
-
-    /**
-     * Creates a new session.
-     *
-     * @return the session ID
-     */
-    private static int createNewSession() {
-        final ApexApiResult responseMsg = target.path("editor/-1/Session/Create").request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, responseMsg.getResult());
-        assertEquals(1, responseMsg.getMessages().size());
-        return Integer.parseInt(responseMsg.getMessages().get(0));
-    }
-
-    /**
-     * Upload policy.
-     *
-     * @param sessionId the session ID
-     * @param modelAsJsonString the model as json string
-     */
-    private void uploadPolicy(final int sessionId, final String modelAsJsonString) {
-        final Builder requestbuilder = target.path("editor/" + sessionId + "/Model/Load").request();
-        final ApexApiResult responseMsg = requestbuilder.put(Entity.json(modelAsJsonString), ApexApiResult.class);
-        assertTrue(responseMsg.isOk());
-    }
-
-    /**
-     * Create a new session, Upload a test policy model, then get a policy, parse it, and compare it to the same policy
-     * in the original model.
-     *
-     * @throws ApexException if there is an Apex Error
-     * @throws JAXBException if there is a JaxB Error
-     **/
-    @Test
-    public void testUploadThenGet() throws ApexException, JAXBException {
-
-        final int sessionId = createNewSession();
-
-        uploadPolicy(sessionId, localmodelString);
-
-        final ApexApiResult responseMsg = target.path("editor/" + sessionId + "/Policy/Get")
-                .queryParam("name", "policy").queryParam("version", "0.0.1").request().get(ApexApiResult.class);
-        assertTrue(responseMsg.isOk());
-
-        // The string in responseMsg.Messages[0] is a JSON representation of a AxPolicy object. Lets parse it
-        final String returnedPolicyAsString = responseMsg.getMessages().get(0);
-        ApexModelReader<AxPolicy> apexPolicyReader = new ApexModelReader<>(AxPolicy.class, false);
-        final AxPolicy returnedpolicy = apexPolicyReader.read(returnedPolicyAsString);
-        // AxPolicy returnedpolicy = RestUtils.getConceptFromJSON(returnedPolicyAsString, AxPolicy.class);
-
-        // Extract the local copy of that policy from the local Apex Policy Model
-        final AxPolicy localpolicy = localmodel.getPolicies().get("policy", "0.0.1");
-
-        // Write that local copy of the AxPolicy object to a Json String, ten parse it again
-        final ApexModelStringWriter<AxPolicy> apexModelWriter = new ApexModelStringWriter<>(false);
-        final String localPolicyString = apexModelWriter.writeJsonString(localpolicy, AxPolicy.class);
-        apexPolicyReader = new ApexModelReader<>(AxPolicy.class, false);
-        final AxPolicy localpolicyReparsed = apexPolicyReader.read(localPolicyString);
-        // AxPolicy localpolicy_reparsed = RestUtils.getConceptFromJSON(returnedPolicyAsString, AxPolicy.class);
-
-        assertNotNull(returnedpolicy);
-        assertNotNull(localpolicy);
-        assertNotNull(localpolicyReparsed);
-        assertEquals(localpolicy, localpolicyReparsed);
-        assertEquals(localpolicy, returnedpolicy);
-    }
-
-    // TODO Full unit testing of REST interface
-
-}
diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResourceTest.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResourceTest.java
deleted file mode 100644
index ace427052..000000000
--- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/ApexEditorRestResourceTest.java
+++ /dev/null
@@ -1,1374 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.MediaType;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Test;
-import org.onap.policy.apex.model.modelapi.ApexApiResult;
-import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
-import org.onap.policy.common.utils.resources.TextFileUtils;
-
-/**
- * Test Apex Editor Rest Resource.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class ApexEditorRestResourceTest extends JerseyTest {
-    @Override
-    protected Application configure() {
-        return new ResourceConfig(ApexEditorRestResource.class);
-    }
-
-    @Test
-    public void testSessionCreate() {
-        ApexApiResult result = target("editor/-2/Session/Create").request().get(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-
-        result = target("editor/-1/Session/Create").request().get(ApexApiResult.class);
-        assertEquals(Result.SUCCESS, result.getResult());
-        final int sessionId = Integer.valueOf(result.getMessages().get(0));
-
-        result = target("editor/-1/Session/Create").request().get(ApexApiResult.class);
-        assertEquals(Result.SUCCESS, result.getResult());
-
-        final int corruptSessionId = ApexEditorRestResource.createCorruptSession();
-
-        target("editor/" + corruptSessionId + "/Model/Analyse").request().get(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/Model/Analyse").request().get(ApexApiResult.class);
-        assertEquals(Result.SUCCESS, result.getResult());
-        result = target("editor/-12345/Model/Analyse").request().get(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-        result = target("editor/12345/Model/Analyse").request().get(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Model/Validate").request().get(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/Model/Validate").request().get(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-        result = target("editor/-12345/Model/Validate").request().get(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-        result = target("editor/12345/Model/Validate").request().get(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-
-        final String modelString = "{" + "\"name\"             : \"Hello\"," + "\"version\"          : \"0.0.2\","
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002699\","
-                + "\"description\"      : \"A description of the model\"" + "}";
-        final Entity<String> csEntity = Entity.entity(modelString, MediaType.APPLICATION_JSON);
-        result = target("editor/-12345/Model/Create").request().post(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/-12345/Model/Create").request().post(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/1234545/Model/Create").request().post(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Model/Create").request().post(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Model/Create").request().post(csEntity, ApexApiResult.class);
-
-        result = target("editor/-12345/Model/Update").request().put(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/-12345/Model/Update").request().put(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/1234545/Model/Update").request().put(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Model/Update").request().put(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Model/Update").request().put(csEntity, ApexApiResult.class);
-
-        result = target("editor/" + corruptSessionId + "/Model/GetKey").request().get(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/Model/GetKey").request().get(ApexApiResult.class);
-        assertEquals(Result.SUCCESS, result.getResult());
-        result = target("editor/-12345/Model/GetKey").request().get(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-        result = target("editor/12345/Model/GetKey").request().get(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-
-        result = target("editor/" + corruptSessionId + "/Model/Get").request().get(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/Model/Get").request().get(ApexApiResult.class);
-        assertEquals(Result.SUCCESS, result.getResult());
-        result = target("editor/-12345/Model/Get").request().get(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-        result = target("editor/12345/Model/Get").request().get(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-
-        String resultString = target("editor/" + corruptSessionId + "/Model/Download").request().get(String.class);
-        assertEquals("", resultString);
-
-        resultString = target("editor/" + sessionId + "/Model/Download").request().get(String.class);
-        assertNotNull(resultString);
-
-        resultString = target("editor/-12345/Model/Download").request().get(String.class);
-        assertEquals("", resultString);
-
-        resultString = target("editor/12345/Model/Download").request().get(String.class);
-        assertEquals("", resultString);
-
-        result = target("editor/" + corruptSessionId + "/KeyInformation/Get").request().get(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/KeyInformation/Get").request().get(ApexApiResult.class);
-        assertEquals(Result.SUCCESS, result.getResult());
-        result = target("editor/-12345/KeyInformation/Get").request().get(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-        result = target("editor/12345/KeyInformation/Get").request().get(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-
-        result = target("editor/" + corruptSessionId + "/Model/Delete").request().delete(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/Model/Delete").request().delete(ApexApiResult.class);
-        assertEquals(Result.SUCCESS, result.getResult());
-        result = target("editor/-12345/Model/Delete").request().delete(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-        result = target("editor/12345/Model/Delete").request().delete(ApexApiResult.class);
-        assertEquals(Result.FAILED, result.getResult());
-    }
-
-    @Test
-    public void testContextSchema() throws IOException {
-        ApexApiResult result = target("editor/-1/Session/Create").request().get(ApexApiResult.class);
-        assertEquals(Result.SUCCESS, result.getResult());
-        final int sessionId = Integer.valueOf(result.getMessages().get(0));
-
-        final int corruptSessionId = ApexEditorRestResource.createCorruptSession();
-
-        result = target("editor/-12345/Validate/ContextSchema").request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Validate/ContextSchema").request().get(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/Validate/ContextSchema").request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = target("editor/" + sessionId + "/Validate/ContextSchema").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = target("editor/" + sessionId + "/Validate/ContextSchema").queryParam("name", "%%%$£")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        final String modelString = TextFileUtils.getTextFileAsString("src/test/resources/models/PolicyModel.json");
-
-        Entity<String> modelEntity = Entity.entity("Somewhere over the rainbow", MediaType.APPLICATION_JSON);
-        result = target("editor/" + -12345 + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + 12345 + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        modelEntity = Entity.entity("", MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        modelEntity = Entity.entity(modelString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/ContextSchema/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/ContextSchema/Get").queryParam("name", (String) null)
-                    .queryParam("version", (String) null).request().get(ApexApiResult.class);
-
-        String csString = "{" + "\"name\"             : \"Hello\"," + "\"version\"          : \"0.0.2\","
-                + "\"schemaFlavour\"    : \"Java\"," + "\"schemaDefinition\" : \"java.lang.String\","
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        Entity<String> csEntity = Entity.entity(csString, MediaType.APPLICATION_JSON);
-        result = target("editor/-12345/ContextSchema/Create").request().post(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/1234545/ContextSchema/Create").request().post(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/ContextSchema/Create").request().post(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/ContextSchema/Create").request().post(csEntity,
-                    ApexApiResult.class);
-
-
-        csString = "{" + "\"name\"             : \"Hello\"," + "\"version\"          : \"0.0.2\","
-                + "\"schemaFlavour\"    : \"Java\"," + "\"schemaDefinition\" : \"my.perfect.String\","
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        csEntity = Entity.entity(csString, MediaType.APPLICATION_JSON);
-        result = target("editor/-12345/ContextSchema/Update").request().put(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/1234545/ContextSchema/Update").request().put(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/ContextSchema/Update").request().put(csEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/ContextSchema/Update").request().put(csEntity, ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/ContextSchema/Get").queryParam("name", "Hello")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/ContextSchema/Get").queryParam("name", "NonExistant")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = target("editor/-123345/ContextSchema/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/123345/ContextSchema/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        target("editor/" + corruptSessionId + "/ContextSchema/Get").queryParam("name", "Hello")
-                    .queryParam("version", (String) null).request().get(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/Validate/ContextSchema").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/ContextSchema/Delete").queryParam("name", "Hello")
-                    .queryParam("version", "0.0.2").request().delete(ApexApiResult.class);
-
-        result = target("editor/-123345/ContextSchema/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/123345/ContextSchema/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/ContextSchema/Delete").queryParam("name", "Hello")
-                .queryParam("version", "0.0.2").request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/ContextSchema/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-    }
-
-    @Test
-    public void testContextAlbum() throws IOException {
-        ApexApiResult result = target("editor/-1/Session/Create").request().get(ApexApiResult.class);
-        assertEquals(Result.SUCCESS, result.getResult());
-        final int sessionId = Integer.valueOf(result.getMessages().get(0));
-        final int corruptSessionId = ApexEditorRestResource.createCorruptSession();
-
-        result = target("editor/-12345/Validate/ContextAlbum").request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Validate/ContextAlbum").request().get(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/Validate/ContextAlbum").request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = target("editor/" + sessionId + "/Validate/ContextAlbum").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = target("editor/" + sessionId + "/Validate/ContextAlbum").queryParam("name", "%%%$£")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        final String modelString = TextFileUtils.getTextFileAsString("src/test/resources/models/PolicyModel.json");
-
-        Entity<String> modelEntity = Entity.entity("Somewhere over the rainbow", MediaType.APPLICATION_JSON);
-        result = target("editor/" + -12345 + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + 12345 + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        modelEntity = Entity.entity("", MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        modelEntity = Entity.entity(modelString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/ContextAlbum/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        String caString = "{" + "\"name\"             : \"Hello\"," + "\"version\"          : \"0.0.2\","
-                + "\"scope\"            : \"Domain\"," + "\"writeable\"        : false,"
-                + "\"itemSchema\"       : {\"name\" : \"StringType\", \"version\" : \"0.0.1\"},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        Entity<String> caEntity = Entity.entity(caString, MediaType.APPLICATION_JSON);
-        result = target("editor/-12345/ContextAlbum/Create").request().post(caEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/1234545/ContextAlbum/Create").request().post(caEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/ContextAlbum/Create").request().post(caEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/ContextAlbum/Create").request().post(caEntity, ApexApiResult.class);
-
-        caString = "{" + "\"name\"             : \"Hello\"," + "\"version\"          : \"0.0.2\","
-                + "\"scope\"            : \"Global\"," + "\"writeable\"        : false,"
-                + "\"itemSchema\"       : {\"name\" : \"StringType\", \"version\" : \"0.0.1\"},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        caEntity = Entity.entity(caString, MediaType.APPLICATION_JSON);
-        result = target("editor/-12345/ContextAlbum/Update").request().put(caEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/1234545/ContextAlbum/Update").request().put(caEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/ContextAlbum/Update").request().put(caEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/ContextAlbum/Update").request().put(caEntity, ApexApiResult.class);
-
-        target("editor/" + corruptSessionId + "/ContextAlbum/Get").queryParam("name", "Hello")
-                    .queryParam("version", (String) null).request().get(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/ContextAlbum/Get").queryParam("name", "Hello")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/ContextAlbum/Get").queryParam("name", "IDontExist")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = target("editor/-123345/ContextAlbum/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/123345/ContextAlbum/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = target("editor/" + sessionId + "/Validate/ContextAlbum").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/ContextAlbum/Delete").queryParam("name", (String) null)
-                    .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-
-        result = target("editor/-123345/ContextAlbum/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/123345/ContextAlbum/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/ContextAlbum/Delete").queryParam("name", "Hello")
-                .queryParam("version", "0.0.2").request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/ContextAlbum/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-    }
-
-    @Test
-    public void testEvent() throws IOException {
-        final int corruptSessionId = ApexEditorRestResource.createCorruptSession();
-
-        ApexApiResult result = target("editor/-1/Session/Create").request().get(ApexApiResult.class);
-        assertEquals(Result.SUCCESS, result.getResult());
-        final int sessionId = Integer.valueOf(result.getMessages().get(0));
-
-        result = target("editor/-12345/Validate/Event").request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = target("editor/" + sessionId + "/Validate/Event").request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Validate/Event").request().get(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/Validate/Event").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = target("editor/" + sessionId + "/Validate/Event").queryParam("name", "%%%$£")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        final String modelString = TextFileUtils.getTextFileAsString("src/test/resources/models/PolicyModel.json");
-
-        Entity<String> modelEntity = Entity.entity("Somewhere over the rainbow", MediaType.APPLICATION_JSON);
-        result = target("editor/" + -12345 + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + 12345 + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        modelEntity = Entity.entity("", MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        modelEntity = Entity.entity(modelString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/Event/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        String entityString = "{" + "\"name\"             : \"Hello\"," + "\"version\"          : \"0.0.2\","
-                + "\"namespace\"        : \"somewhere.over.the.rainbow\"," + "\"source\"           : \"beginning\","
-                + "\"target\"           : \"end\"," + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        Entity<String> entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/-12345/Event/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/1234545/Event/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Event/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/Event/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Event/Create").request().post(entity, ApexApiResult.class);
-
-        entityString = "{" + "\"name\"             : \"Hiya\"," + "\"version\"          : \"0.0.2\","
-                + "\"namespace\"        : \"somewhere.over.the.rainbow\"," + "\"source\"           : \"beginning\","
-                + "\"target\"           : \"end\"," + "\"parameters\"       : {},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Event/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"HowsItGoing\"," + "\"version\"          : \"0.0.2\","
-                + "\"namespace\"        : \"somewhere.over.the.rainbow\"," + "\"source\"           : \"beginning\","
-                + "\"target\"           : \"end\","
-                + "\"parameters\"       : {\"Par0\" : {\"name\" : \"StringType\", \"version\" : \"0.0.1\", "
-                + "\"localName\" : \"Par0\", \"optional\" : false}},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Event/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hi\"," + "\"version\"          : \"0.0.2\","
-                + "\"namespace\"        : \"somewhere.over.the.rainbow\"," + "\"source\"           : \"beginning\","
-                + "\"target\"           : \"end\"," + "\"parameters\"       : {\"Par0\" : null},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Event/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"GoodDay\"," + "\"version\"          : \"0.0.2\","
-                + "\"namespace\"        : \"somewhere.over.the.rainbow\"," + "\"source\"           : \"beginning\","
-                + "\"target\"           : \"end\","
-                + "\"parameters\"       : {\"Par0\" : {\"name\" : \"NonExistantType\", \"version\" : \"0.0.1\", "
-                + "\"localName\" : \"Par0\", \"optional\" : false}},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Event/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hello\"," + "\"version\"          : \"0.0.2\","
-                + "\"namespace\"        : \"somewhere.over.someone.elses.rainbow\","
-                + "\"source\"           : \"start\"," + "\"target\"           : \"finish\","
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/-12345/Event/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/1234545/Event/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Event/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Event/Update").request().put(entity, ApexApiResult.class);
-
-        entityString = "{" + "\"name\"             : null," + "\"version\"          : \"0.0.2\","
-                + "\"namespace\"        : \"somewhere.over.someone.elses.rainbow\","
-                + "\"source\"           : \"start\"," + "\"target\"           : \"finish\","
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Event/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"NonExistantEvent\"," + "\"version\"          : \"0.0.2\","
-                + "\"namespace\"        : \"somewhere.over.someone.elses.rainbow\","
-                + "\"source\"           : \"start\"," + "\"target\"           : \"finish\","
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Event/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = target("editor/" + sessionId + "/Event/Get").queryParam("name", "Hello")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/Event/Get").queryParam("name", "IDontExist")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = target("editor/-123345/Event/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/123345/Event/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Event/Get").queryParam("name", "Hello")
-                    .queryParam("version", (String) null).request().get(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/Validate/Event").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/-12345/Validate/Event").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/12345/Validate/Event").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Event/Delete").queryParam("name", (String) null)
-                    .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-
-        result = target("editor/-123345/Event/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/123345/Event/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Event/Delete").queryParam("name", "Hello")
-                .queryParam("version", "0.0.2").request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/Event/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-    }
-
-    @Test
-    public void testTask() throws IOException {
-        final int corruptSessionId = ApexEditorRestResource.createCorruptSession();
-
-        ApexApiResult result = target("editor/-1/Session/Create").request().get(ApexApiResult.class);
-        assertEquals(Result.SUCCESS, result.getResult());
-        final int sessionId = Integer.valueOf(result.getMessages().get(0));
-
-        result = target("editor/-12345/Validate/Task").request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = target("editor/" + sessionId + "/Validate/Task").request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        try {
-            target("editor/" + corruptSessionId + "/Validate/Task").request().get(ApexApiResult.class);
-        } catch (final Exception e) {
-            assertEquals("HTTP 500 Request failed.", e.getMessage());
-        }
-
-        result = target("editor/" + sessionId + "/Validate/Task").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = target("editor/" + sessionId + "/Validate/Task").queryParam("name", "%%%$£")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        final String modelString = TextFileUtils.getTextFileAsString("src/test/resources/models/PolicyModel.json");
-
-        Entity<String> modelEntity = Entity.entity("Somewhere over the rainbow", MediaType.APPLICATION_JSON);
-        result = target("editor/" + -12345 + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + 12345 + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        modelEntity = Entity.entity("", MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        modelEntity = Entity.entity(modelString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/Event/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        String entityString = "{" + "\"name\"             : \"Hello\"," + "\"version\"          : \"0.0.2\","
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        Entity<String> entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/-12345/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/1234545/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-
-        entityString = "{" + "\"name\"             : \"Hiya\"," + "\"version\"          : \"0.0.2\","
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"HowsItGoing\"," + "\"version\"          : \"0.0.2\","
-                + "\"inputFields\"      : {\"IField0\" : {\"name\" : \"StringType\", \"version\" : \"0.0.1\", "
-                + "\"localName\" : \"IField0\", \"optional\" : false}},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hi\"," + "\"version\"          : \"0.0.2\","
-                + "\"inputFields\"      : {\"IField0\" : null},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"GoodDay\"," + "\"version\"          : \"0.0.2\","
-                + "\"inputFields\"      : {\"IField0\" : {\"name\" : \"NonExistantType\", \"version\" : \"0.0.1\", "
-                + "\"localName\" : \"IField0\", \"optional\" : false}},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Howdy\"," + "\"version\"          : \"0.0.2\","
-                + "\"inputFields\"      : {\"IField0\" : {\"name\" : \"NonExistantType\", \"version\" : \"0.0.1\", "
-                + "\"localName\" : \"NotIField0\", \"optional\" : false}},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"HowsItGoing2\"," + "\"version\"          : \"0.0.2\","
-                + "\"outputFields\"     : {\"OField0\" : {\"name\" : \"StringType\", \"version\" : \"0.0.1\", "
-                + "\"localName\" : \"OField0\", \"optional\" : false}},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hi2\"," + "\"version\"          : \"0.0.2\","
-                + "\"outputFields\"     : {\"OField0\" : null},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"GoodDay2\"," + "\"version\"          : \"0.0.2\","
-                + "\"outputFields\"     : {\"OField0\" : {\"name\" : \"NonExistantType\", \"version\" : \"0.0.1\","
-                + " \"localName\" : \"OField0\", \"optional\" : false}},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Howdy2\"," + "\"version\"          : \"0.0.2\","
-                + "\"outputFields\"     : {\"OField0\" : {\"name\" : \"NonExistantType\", \"version\" : \"0.0.1\", "
-                + "\"localName\" : \"NotOField0\", \"optional\" : false}},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"HowsItGoing3\"," + "\"version\"          : \"0.0.2\","
-                + "\"taskLogic\"        : {\"logicFlavour\" : \"LemonAndLime\", \"logic\" : \"lots of lemons,"
-                + " lots of lime\"}," + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hi3\"," + "\"version\"          : \"0.0.2\","
-                + "\"taskLogic\"        : null," + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"GoodDay3\"," + "\"version\"          : \"0.0.2\","
-                + "\"namespace\"        : \"somewhere.over.the.rainbow\"," + "\"source\"           : \"beginning\","
-                + "\"target\"           : \"end\","
-                + "\"taskLogic\"        : {\"logicFlavour\" : \"UNDEFINED\", \"logic\" : \"lots of lemons,"
-                + " lots of lime\"}," + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Howdy3\"," + "\"version\"          : \"0.0.2\","
-                + "\"taskLogic\"        : {\"logicFlavour\" : \"LemonAndLime\", \"logic\" : null},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"HowsItGoing4\"," + "\"version\"          : \"0.0.2\","
-                + "\"parameters\"       : {\"Par0\" : {\"parameterName\" : \"Par0\", "
-                + "\"defaultValue\" : \"Parameter Defaultvalue\"}},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hi4\"," + "\"version\"          : \"0.0.2\","
-                + "\"parameters\"       : {\"Par0\" : null},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"GoodDay4\"," + "\"version\"          : \"0.0.2\","
-                + "\"parameters\"       : {\"Par0\" : {\"parameterName\" : \"NotPar0\", \"defaultValue\" : "
-                + "\"Parameter Defaultvalue\"}}," + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Howdy4\"," + "\"version\"          : \"0.0.2\","
-                + "\"parameters\"       : {\"Par0\" : {\"parameterName\" : \"MyParameter\", \"defaultValue\" : null}},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"HowsItGoing5\"," + "\"version\"          : \"0.0.2\","
-                + "\"contexts\"         : [{\"name\" : \"contextAlbum0\", \"version\" : \"0.0.1\"}],"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hi5\"," + "\"version\"          : \"0.0.2\","
-                + "\"contexts\"         : []," + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"GoodDay5\"," + "\"version\"          : \"0.0.2\","
-                + "\"contexts\"         : [{\"name\" : \"NonExistantType\", \"version\" : \"0.0.1\"}],"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Howdy5\"," + "\"version\"          : \"0.0.2\","
-                + "\"contexts\"         : [{\"name\" : null, \"version\" : \"0.0.1\"}],"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002799\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hello\"," + "\"version\"          : \"0.0.2\","
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/-12345/Task/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/1234545/Task/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Task/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Task/Update").request().put(entity, ApexApiResult.class);
-
-        entityString = "{" + "\"name\"             : null," + "\"version\"          : \"0.0.2\","
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"NonExistantEvent\"," + "\"version\"          : \"0.0.2\","
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Task/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = target("editor/" + sessionId + "/Task/Get").queryParam("name", "Hello")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/Task/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/Task/Get").queryParam("name", "IDontExist")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = target("editor/-123345/Task/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/123345/Task/Get").queryParam("name", (String) null).queryParam("version", (String) null)
-                .request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Task/Get").queryParam("name", "Hello")
-                    .queryParam("version", (String) null).request().get(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/Validate/Event").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/-12345/Validate/Event").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/12345/Validate/Event").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Task/Delete").queryParam("name", (String) null)
-                    .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-
-        result = target("editor/-123345/Task/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/123345/Task/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Task/Delete").queryParam("name", "Hello")
-                .queryParam("version", "0.0.2").request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/Task/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-    }
-
-    @Test
-    public void testPolicy() throws IOException {
-        final int corruptSessionId = ApexEditorRestResource.createCorruptSession();
-
-        ApexApiResult result = target("editor/-1/Session/Create").request().get(ApexApiResult.class);
-        assertEquals(Result.SUCCESS, result.getResult());
-        final int sessionId = Integer.valueOf(result.getMessages().get(0));
-
-        result = target("editor/-12345/Model/Validate").request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = target("editor/" + sessionId + "/Model/Validate").request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Model/Validate").request().get(ApexApiResult.class);
-        result = target("editor/" + sessionId + "/Model/Validate").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        result = target("editor/" + sessionId + "/Model/Validate").queryParam("name", "%%%$£")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        final String modelString = TextFileUtils.getTextFileAsString("src/test/resources/models/PolicyModel.json");
-
-        Entity<String> modelEntity = Entity.entity("Somewhere over the rainbow", MediaType.APPLICATION_JSON);
-        result = target("editor/" + -12345 + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + 12345 + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        modelEntity = Entity.entity("", MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        modelEntity = Entity.entity(modelString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Model/Load").request().put(modelEntity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/Event/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        String entityString = "{" + "\"name\"             : \"Hello\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"    : {\"name\" : \"task\", \"version\" : \"0.0.1\"}," + "  \"stateOutputs\"   : {"
-                + "   \"so0\"           : {"
-                + "    \"event\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"    : null" + "   }" + "  }," + "  \"tasks\"          : {"
-                + "   \"tr0\"           : {" + "    \"task\"         : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"   : \"DIRECT\"," + "    \"outputName\"   : \"so0\"" + "   }" + "  }" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        Entity<String> entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/-12345/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/1234545/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_EXISTS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-
-        entityString = "{" + "\"name\"             : \"GoodTaSeeYa\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : null," + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"HelloAnother\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"    : {\"name\" : \"task\", \"version\" : \"0.0.1\"}," + "  \"stateOutputs\"   : {"
-                + "   \"so0\"           : {"
-                + "    \"event\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"    : null" + "   }" + "  }," + "  \"tasks\"          : {"
-                + "   \"tr0\"           : {" + "    \"task\"         : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"   : \"DIRECT\"," + "    \"outputName\"   : \"so0\"" + "   }" + "  }" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hello2\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : null,"
-                + "  \"defaultTask\"    : {\"name\" : \"task\", \"version\" : \"0.0.1\"}," + "  \"stateOutputs\"   : {"
-                + "   \"so0\"           : {"
-                + "    \"event\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"    : null" + "   }" + "  }," + "  \"tasks\"          : {"
-                + "   \"tr0\"           : {" + "    \"task\"         : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"   : \"DIRECT\"," + "    \"outputName\"   : \"so0\"" + "   }" + "  }" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hello3\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"    : null," + "  \"stateOutputs\"   : {" + "   \"so0\"           : {"
-                + "    \"event\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"    : null" + "   }" + "  }," + "  \"tasks\"          : {"
-                + "   \"tr0\"           : {" + "    \"task\"         : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"   : \"DIRECT\"," + "    \"outputName\"   : \"so0\"" + "   }" + "  }" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hello4\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"    : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "  \"stateOutputs\"   : null," + "  \"tasks\"          : {" + "   \"tr0\"           : {"
-                + "    \"task\"         : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"   : \"DIRECT\"," + "    \"outputName\"   : \"so0\"" + "   }" + "  }" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hello5\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"    : {\"name\" : \"task\", \"version\" : \"0.0.1\"}," + "  \"stateOutputs\"   : {"
-                + "   \"so0\"           : {"
-                + "    \"event\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"    : null" + "   }" + "  }," + "  \"tasks\"          : null" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hello6\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : {\"name\" : \"IDontExist\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"    : {\"name\" : \"task\", \"version\" : \"0.0.1\"}," + "  \"stateOutputs\"   : {"
-                + "   \"so0\"           : {"
-                + "    \"event\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"    : null" + "   }" + "  }," + "  \"tasks\"          : {"
-                + "   \"tr0\"           : {" + "    \"task\"         : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"   : \"DIRECT\"," + "    \"outputName\"   : \"so0\"" + "   }" + "  }" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hello7\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : null" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hello8\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"    : {\"name\" : \"task\", \"version\" : \"0.0.1\"}," + "  \"stateOutputs\"   : {"
-                + "   \"so0\"           : {"
-                + "    \"event\"        : {\"name\" : \"IDontExist\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"    : null" + "   }" + "  }," + "  \"tasks\"          : {"
-                + "   \"tr0\"           : {" + "    \"task\"         : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"   : \"DIRECT\"," + "    \"outputName\"   : \"so0\"" + "   }" + "  }" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hello9\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"    : {\"name\" : \"task\", \"version\" : \"0.0.1\"}," + "  \"stateOutputs\"   : {"
-                + "   \"so0\"           : {" + "    \"event\"        : null," + "    \"nextState\"    : null" + "   }"
-                + "  }," + "  \"tasks\"          : {" + "   \"tr0\"           : {"
-                + "    \"task\"         : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"   : \"DIRECT\"," + "    \"outputName\"   : \"so0\"" + "   }" + "  }" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        System.err.println(result);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hello10\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"    : {\"name\" : \"task\", \"version\" : \"0.0.1\"}," + "  \"stateOutputs\"   : {"
-                + "   \"so0\"           : {"
-                + "    \"event\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"    : null" + "   }" + "  }," + "  \"tasks\"          : {"
-                + "   \"tr0\"           : {"
-                + "    \"task\"         : {\"name\" : \"IDontExist\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"   : \"DIRECT\"," + "    \"outputName\"   : \"so0\"" + "   }" + "  }" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"Hello11\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"    : {\"name\" : \"task\", \"version\" : \"0.0.1\"}," + "  \"stateOutputs\"   : {"
-                + "   \"so0\"           : {"
-                + "    \"event\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"    : null" + "   }" + "  }," + "  \"tasks\"          : {"
-                + "   \"tr0\"           : {" + "    \"task\"         : null," + "    \"outputType\"   : \"DIRECT\","
-                + "    \"outputName\"   : \"so0\"" + "   }" + "  }" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"                 : \"Hello12\"," + "\"version\"              : \"0.0.2\","
-                + "\"template\"             : \"somewhere.over.the.rainbow\"," + "\"firstState\"           : \"state\","
-                + "\"states\"               : {" + " \"state\"               : {"
-                + "  \"name\"               : \"state\","
-                + "  \"trigger\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"        : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "  \"taskSelectionLogic\" : {\"logicFlavour\" : \"LemonAndLime\", \"logic\" : \"lots of lemons, "
-                + "lots of lime\"}," + "  \"stateOutputs\"       : {" + "   \"so0\"               : {"
-                + "    \"event\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"        : null" + "   }" + "  }," + "  \"tasks\"              : {"
-                + "   \"tr0\"               : {"
-                + "    \"task\"             : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"       : \"DIRECT\"," + "    \"outputName\"       : \"so0\"" + "   }" + "  }"
-                + " }" + "}," + "\"uuid\"                 : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"          : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"                 : \"Hello13\"," + "\"version\"              : \"0.0.2\","
-                + "\"template\"             : \"somewhere.over.the.rainbow\"," + "\"firstState\"           : \"state\","
-                + "\"states\"               : {" + " \"state\"               : {"
-                + "  \"name\"               : \"state\","
-                + "  \"trigger\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"        : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "  \"taskSelectionLogic\" : {\"logicFlavour\" : \"LemonAndLime\", \"logic\" : null},"
-                + "  \"stateOutputs\"       : {" + "   \"so0\"               : {"
-                + "    \"event\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"        : null" + "   }" + "  }," + "  \"tasks\"              : {"
-                + "   \"tr0\"               : {"
-                + "    \"task\"             : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"       : \"DIRECT\"," + "    \"outputName\"       : \"so0\"" + "   }" + "  }"
-                + " }" + "}," + "\"uuid\"                 : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"          : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"                 : \"Hello14\"," + "\"version\"              : \"0.0.2\","
-                + "\"template\"             : \"somewhere.over.the.rainbow\"," + "\"firstState\"           : \"state\","
-                + "\"states\"               : {" + " \"state\"               : {"
-                + "  \"name\"               : \"state\","
-                + "  \"trigger\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"        : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "  \"taskSelectionLogic\" : {\"logicFlavour\" : \"LemonAndLime\", \"logic\" : \"lots of lemons, "
-                + "lots of lime\"},"
-                + "  \"contexts\"           : [{\"name\" : \"contextAlbum0\", \"version\" : \"0.0.1\"}],"
-                + "  \"stateOutputs\"       : {" + "   \"so0\"               : {"
-                + "    \"event\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"        : null" + "   }" + "  }," + "  \"tasks\"              : {"
-                + "   \"tr0\"               : {"
-                + "    \"task\"             : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"       : \"DIRECT\"," + "    \"outputName\"       : \"so0\"" + "   }" + "  }"
-                + " }" + "}," + "\"uuid\"                 : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"          : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"                 : \"Hello15\"," + "\"version\"              : \"0.0.2\","
-                + "\"template\"             : \"somewhere.over.the.rainbow\"," + "\"firstState\"           : \"state\","
-                + "\"states\"               : {" + " \"state\"               : {"
-                + "  \"name\"               : \"state\","
-                + "  \"trigger\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"        : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "  \"taskSelectionLogic\" : {\"logicFlavour\" : \"LemonAndLime\", \"logic\" : \"lots of lemons, "
-                + "lots of lime\"},"
-                + "  \"contexts\"           : [{\"name\" : \"IDontExist\", \"version\" : \"0.0.1\"}],"
-                + "  \"stateOutputs\"       : {" + "   \"so0\"               : {"
-                + "    \"event\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"        : null" + "   }" + "  }," + "  \"tasks\"              : {"
-                + "   \"tr0\"               : {"
-                + "    \"task\"             : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"       : \"DIRECT\"," + "    \"outputName\"       : \"so0\"" + "   }" + "  }"
-                + " }" + "}," + "\"uuid\"                 : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"          : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        entityString = "{" + "\"name\"                 : \"Hello16\"," + "\"version\"              : \"0.0.2\","
-                + "\"template\"             : \"somewhere.over.the.rainbow\"," + "\"firstState\"           : \"state\","
-                + "\"states\"               : {" + " \"state\"               : {"
-                + "  \"name\"               : \"state\","
-                + "  \"trigger\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"        : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "  \"taskSelectionLogic\" : {\"logicFlavour\" : \"LemonAndLime\", \"logic\" : \"lots of lemons, "
-                + "lots of lime\"}," + "  \"contexts\"           : [null]," + "  \"stateOutputs\"       : {"
-                + "   \"so0\"               : {"
-                + "    \"event\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"        : null" + "   }" + "  }," + "  \"tasks\"              : {"
-                + "   \"tr0\"               : {"
-                + "    \"task\"             : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"       : \"DIRECT\"," + "    \"outputName\"       : \"so0\"" + "   }" + "  }"
-                + " }" + "}," + "\"uuid\"                 : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"          : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"                 : \"Hello17\"," + "\"version\"              : \"0.0.2\","
-                + "\"template\"             : \"somewhere.over.the.rainbow\"," + "\"firstState\"           : \"state\","
-                + "\"states\"               : {" + " \"state\"               : {"
-                + "  \"name\"               : \"state\","
-                + "  \"trigger\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"        : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "  \"taskSelectionLogic\" : {\"logicFlavour\" : \"LemonAndLime\", \"logic\" : \"lots of lemons, "
-                + "lots of lime\"},"
-                + "  \"contexts\"           : [{\"name\" : \"contextAlbum0\", \"version\" : \"0.0.1\"}],"
-                + "  \"stateOutputs\"       : {" + "   \"so0\"               : {"
-                + "    \"event\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"        : null" + "   }" + "  }," + "  \"tasks\"              : {"
-                + "   \"tr0\"               : {"
-                + "    \"task\"             : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"       : \"DIRECT\"," + "    \"outputName\"       : \"so0\"" + "   }" + "  },"
-                + "  \"finalizers\"         : {"
-                + "   \"sf0\"               : {\"logicFlavour\" : \"LemonAndLime\", \"logic\" : \"lots of lemons, "
-                + "lots of lime\"}" + "  }" + " }" + "},"
-                + "\"uuid\"                 : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"          : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        entityString = "{" + "\"name\"                 : \"Hello18\"," + "\"version\"              : \"0.0.2\","
-                + "\"template\"             : \"somewhere.over.the.rainbow\"," + "\"firstState\"           : \"state\","
-                + "\"states\"               : {" + " \"state\"               : {"
-                + "  \"name\"               : \"state\","
-                + "  \"trigger\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"        : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "  \"taskSelectionLogic\" : {\"logicFlavour\" : \"LemonAndLime\", \"logic\" : \"lots of lemons, "
-                + "lots of lime\"},"
-                + "  \"contexts\"           : [{\"name\" : \"contextAlbum0\", \"version\" : \"0.0.1\"}],"
-                + "  \"stateOutputs\"       : {" + "   \"so0\"               : {"
-                + "    \"event\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"        : null" + "   }" + "  }," + "  \"tasks\"              : {"
-                + "   \"tr0\"               : {"
-                + "    \"task\"             : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"       : \"DIRECT\"," + "    \"outputName\"       : \"so0\"" + "   }" + "  },"
-                + "  \"finalizers\"         : {" + "   \"sf0\"               : null" + "  }" + " }" + "},"
-                + "\"uuid\"                 : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"          : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"                 : \"Hello19\"," + "\"version\"              : \"0.0.2\","
-                + "\"template\"             : \"somewhere.over.the.rainbow\"," + "\"firstState\"           : \"state\","
-                + "\"states\"               : {" + " \"state\"               : {"
-                + "  \"name\"               : \"state\","
-                + "  \"trigger\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"        : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "  \"taskSelectionLogic\" : {\"logicFlavour\" : \"LemonAndLime\", \"logic\" : \"lots of lemons, "
-                + "lots of lime\"},"
-                + "  \"contexts\"           : [{\"name\" : \"contextAlbum0\", \"version\" : \"0.0.1\"}],"
-                + "  \"stateOutputs\"       : {" + "   \"so0\"               : {"
-                + "    \"event\"            : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"        : null" + "   }" + "  }," + "  \"tasks\"              : {"
-                + "   \"tr0\"               : {"
-                + "    \"task\"             : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"       : \"DIRECT\"," + "    \"outputName\"       : \"so0\"" + "   }" + "  },"
-                + "  \"finalizers\"         : {"
-                + "   \"sf0\"               : {\"logicFlavour\" : \"LemonAndLime\", \"logic\" : null}" + "  }" + " }"
-                + "}," + "\"uuid\"                 : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"          : \"A description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Create").request().post(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"HelloAnother\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"    : {\"name\" : \"task\", \"version\" : \"0.0.1\"}," + "  \"stateOutputs\"   : {"
-                + "   \"so0\"           : {"
-                + "    \"event\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"    : null" + "   }" + "  }," + "  \"tasks\"          : {"
-                + "   \"tr0\"           : {" + "    \"task\"         : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"   : \"DIRECT\"," + "    \"outputName\"   : \"so0\"" + "   }" + "  }" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A better description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/-12345/Policy/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/1234545/Policy/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Policy/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        result = target("editor/" + sessionId + "/Policy/Update").queryParam("firstStatePeriodic", "true").request()
-                .put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Policy/Update").request().put(entity, ApexApiResult.class);
-
-        entityString = "{" + "\"name\"             : null," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"    : {\"name\" : \"task\", \"version\" : \"0.0.1\"}," + "  \"stateOutputs\"   : {"
-                + "   \"so0\"           : {"
-                + "    \"event\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"    : null" + "   }" + "  }," + "  \"tasks\"          : {"
-                + "   \"tr0\"           : {" + "    \"task\"         : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"   : \"DIRECT\"," + "    \"outputName\"   : \"so0\"" + "   }" + "  }" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A better description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        entityString = "{" + "\"name\"             : \"IDontExist\"," + "\"version\"          : \"0.0.2\","
-                + "\"template\"         : \"somewhere.over.the.rainbow\"," + "\"firstState\"       : \"state\","
-                + "\"states\"           : {" + " \"state\"           : {" + "  \"name\"           : \"state\","
-                + "  \"trigger\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "  \"defaultTask\"    : {\"name\" : \"task\", \"version\" : \"0.0.1\"}," + "  \"stateOutputs\"   : {"
-                + "   \"so0\"           : {"
-                + "    \"event\"        : {\"name\" : \"inEvent\", \"version\" : \"0.0.1\"},"
-                + "    \"nextState\"    : null" + "   }" + "  }," + "  \"tasks\"          : {"
-                + "   \"tr0\"           : {" + "    \"task\"         : {\"name\" : \"task\", \"version\" : \"0.0.1\"},"
-                + "    \"outputType\"   : \"DIRECT\"," + "    \"outputName\"   : \"so0\"" + "   }" + "  }" + " }" + "},"
-                + "\"uuid\"             : \"1fa2e430-f2b2-11e6-bc64-92361f002671\","
-                + "\"description\"      : \"A better description of hello\"" + "}";
-        entity = Entity.entity(entityString, MediaType.APPLICATION_JSON);
-        result = target("editor/" + sessionId + "/Policy/Update").request().put(entity, ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-
-        result = target("editor/" + sessionId + "/Policy/Get").queryParam("name", "Hello")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/Policy/Get").queryParam("name", "IDontExist")
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.CONCEPT_DOES_NOT_EXIST, result.getResult());
-        result = target("editor/" + sessionId + "/Policy/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/-123345/Policy/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/123345/Policy/Get").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Policy/Get").queryParam("name", "Hello")
-                    .queryParam("version", (String) null).request().get(ApexApiResult.class);
-
-        result = target("editor/" + sessionId + "/Validate/Event").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/-12345/Validate/Event").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/12345/Validate/Event").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().get(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-
-        target("editor/" + corruptSessionId + "/Policy/Delete").queryParam("name", (String) null)
-                    .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-
-        result = target("editor/-123345/Policy/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/123345/Policy/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.FAILED, result.getResult());
-        result = target("editor/" + sessionId + "/Policy/Delete").queryParam("name", "Hello")
-                .queryParam("version", "0.0.2").request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-        result = target("editor/" + sessionId + "/Policy/Delete").queryParam("name", (String) null)
-                .queryParam("version", (String) null).request().delete(ApexApiResult.class);
-        assertEquals(ApexApiResult.Result.SUCCESS, result.getResult());
-    }
-}
diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeansTest.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeansTest.java
deleted file mode 100644
index bdf47fedc..000000000
--- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/BeansTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import org.junit.Test;
-
-/**
- * Test the beans.
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-public class BeansTest {
-
-    @Test
-    public void testBeans() {
-        assertNotNull(new BeanEvent().toString());
-        assertNotNull(new BeanState().toString());
-        assertNotNull(new BeanContextAlbum().toString());
-        assertNotNull(new BeanPolicy().toString());
-        assertNotNull(new BeanContextSchema().toString());
-        assertNotNull(new BeanField().toString());
-        assertNotNull(new BeanModel().toString());
-        assertNotNull(new BeanLogic().toString());
-        assertNotNull(new BeanStateOutput().toString());
-        assertNotNull(new BeanTaskParameter().toString());
-        assertNotNull(new BeanKeyRef().toString());
-        assertNotNull(new BeanStateTaskRef().toString());
-        assertNotNull(new BeanTask().toString());
-
-        final BeanState beanState = new BeanState();
-        assertNull(beanState.getName());
-        beanState.setDefaultTask(new BeanKeyRef());
-        assertNotNull(beanState.getDefaultTask());
-
-        final BeanEvent beanEvent = new BeanEvent();
-        assertNull(beanEvent.get("name"));
-
-        final DummyBeanBase beanFake = new DummyBeanBase();
-        assertNull(beanFake.get("name"));
-        assertNull(beanFake.get("field1"));
-
-        assertThatThrownBy(() -> beanFake.get("iDontExist")).isInstanceOf(IllegalArgumentException.class);
-        assertThatThrownBy(() -> beanFake.get("nome")).isInstanceOf(IllegalArgumentException.class);
-        assertThatThrownBy(() -> beanFake.get("field2")).isInstanceOf(IllegalArgumentException.class);
-        assertThatThrownBy(() -> beanFake.get("field3")).isInstanceOf(IllegalArgumentException.class);
-    }
-}
diff --git a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/DummyBeanBase.java b/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/DummyBeanBase.java
deleted file mode 100644
index 25a10e269..000000000
--- a/client/client-editor/src/test/java/org/onap/policy/apex/client/editor/rest/handling/bean/DummyBeanBase.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.client.editor.rest.handling.bean;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The Event Bean.
- */
-@XmlType
-public class DummyBeanBase extends BeanBase {
-    private String name = null;
-    private String version = null;
-    private String field1 = null;
-    private int field2 = 0;
-    private int field3 = 0;
-
-    public String getName() {
-        field1 = name;
-        return field1;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public int getField2() {
-        field3 = field2;
-        return field3;
-    }
-}
diff --git a/client/client-editor/src/test/resources/models/PolicyModel.json b/client/client-editor/src/test/resources/models/PolicyModel.json
deleted file mode 100644
index 81c222609..000000000
--- a/client/client-editor/src/test/resources/models/PolicyModel.json
+++ /dev/null
@@ -1,708 +0,0 @@
-{
-   "apexPolicyModel" : {
-      "key" : {
-         "name" : "PolicyModel",
-         "version" : "0.0.1"
-      },
-      "keyInformation" : {
-         "key" : {
-            "name" : "KeyInfoMapKey",
-            "version" : "0.0.1"
-         },
-         "keyInfoMap" : {
-            "entry" : [ {
-               "key" : {
-                  "name" : "ContextSchemas",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "ContextSchemas",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e000",
-                  "description" : "Generated description for concept referred to by key \"ContextSchemas:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "KeyInfoMapKey",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "KeyInfoMapKey",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e001",
-                  "description" : "Generated description for concept referred to by key \"KeyInfoMapKey:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "MapType",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "MapType",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e002",
-                  "description" : "Generated description for concept referred to by key \"MapType:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "PolicyModel",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "PolicyModel",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e003",
-                  "description" : "Generated description for concept referred to by key \"PolicyModel:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "StringType",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "StringType",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e004",
-                  "description" : "Generated description for concept referred to by key \"StringType:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "context",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "context",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e005",
-                  "description" : "Generated description for concept referred to by key \"context:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "contextAlbum0",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "contextAlbum0",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e006",
-                  "description" : "Generated description for concept referred to by key \"contextAlbum0:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "contextAlbum1",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "contextAlbum1",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e007",
-                  "description" : "Generated description for concept referred to by key \"contextAlbum1:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "eventContextItem0",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "eventContextItem0",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e008",
-                  "description" : "Generated description for concept referred to by key \"eventContextItem0:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "eventContextItem1",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "eventContextItem1",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e009",
-                  "description" : "Generated description for concept referred to by key \"eventContextItem1:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "events",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "events",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e010",
-                  "description" : "Generated description for concept referred to by key \"events:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "inEvent",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "inEvent",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e011",
-                  "description" : "Generated description for concept referred to by key \"inEvent:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "outEvent0",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "outEvent0",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e012",
-                  "description" : "Generated description for concept referred to by key \"outEvent0:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "outEvent1",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "outEvent1",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e013",
-                  "description" : "Generated description for concept referred to by key \"outEvent1:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "policies",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "policies",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e014",
-                  "description" : "Generated description for concept referred to by key \"policies:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "policy",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "policy",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e015",
-                  "description" : "Generated description for concept referred to by key \"policy:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "task",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "task",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e016",
-                  "description" : "Generated description for concept referred to by key \"task:0.0.1\""
-               }
-            }, {
-               "key" : {
-                  "name" : "tasks",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "tasks",
-                     "version" : "0.0.1"
-                  },
-                  "UUID" : "0ce9168c-e6df-414f-9646-6da464b6e017",
-                  "description" : "Generated description for concept referred to by key \"tasks:0.0.1\""
-               }
-            } ]
-         }
-      },
-      "policies" : {
-         "key" : {
-            "name" : "policies",
-            "version" : "0.0.1"
-         },
-         "policyMap" : {
-            "entry" : [ {
-               "key" : {
-                  "name" : "policy",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "policyKey" : {
-                     "name" : "policy",
-                     "version" : "0.0.1"
-                  },
-                  "template" : "FREEFORM",
-                  "state" : {
-                     "entry" : [ {
-                        "key" : "state",
-                        "value" : {
-                           "stateKey" : {
-                              "parentKeyName" : "policy",
-                              "parentKeyVersion" : "0.0.1",
-                              "parentLocalName" : "NULL",
-                              "localName" : "state"
-                           },
-                           "trigger" : {
-                              "name" : "inEvent",
-                              "version" : "0.0.1"
-                           },
-                           "stateOutputs" : {
-                              "entry" : [ {
-                                 "key" : "stateOutput0",
-                                 "value" : {
-                                    "key" : {
-                                       "parentKeyName" : "policy",
-                                       "parentKeyVersion" : "0.0.1",
-                                       "parentLocalName" : "state",
-                                       "localName" : "stateOutput0"
-                                    },
-                                    "outgoingEvent" : {
-                                       "name" : "outEvent0",
-                                       "version" : "0.0.1"
-                                    },
-                                    "nextState" : {
-                                       "parentKeyName" : "NULL",
-                                       "parentKeyVersion" : "0.0.0",
-                                       "parentLocalName" : "NULL",
-                                       "localName" : "NULL"
-                                    }
-                                 }
-                              } ]
-                           },
-                           "contextAlbumReference" : [ {
-                              "name" : "contextAlbum0",
-                              "version" : "0.0.1"
-                           }, {
-                              "name" : "contextAlbum1",
-                              "version" : "0.0.1"
-                           } ],
-                           "taskSelectionLogic" : {
-                              "key" : "taskSelectionLogic",
-                              "logicFlavour" : "MVEL",
-                              "logic" : "Some TS logic"
-                           },
-                           "stateFinalizerLogicMap" : {
-                              "entry" : [ ]
-                           },
-                           "defaultTask" : {
-                              "name" : "task",
-                              "version" : "0.0.1"
-                           },
-                           "taskReferences" : {
-                              "entry" : [ {
-                                 "key" : {
-                                    "name" : "task",
-                                    "version" : "0.0.1"
-                                 },
-                                 "value" : {
-                                    "key" : {
-                                       "parentKeyName" : "policy",
-                                       "parentKeyVersion" : "0.0.1",
-                                       "parentLocalName" : "state",
-                                       "localName" : "task"
-                                    },
-                                    "outputType" : "DIRECT",
-                                    "output" : {
-                                       "parentKeyName" : "policy",
-                                       "parentKeyVersion" : "0.0.1",
-                                       "parentLocalName" : "state",
-                                       "localName" : "stateOutput0"
-                                    }
-                                 }
-                              } ]
-                           }
-                        }
-                     } ]
-                  },
-                  "firstState" : "state"
-               }
-            } ]
-         }
-      },
-      "tasks" : {
-         "key" : {
-            "name" : "tasks",
-            "version" : "0.0.1"
-         },
-         "taskMap" : {
-            "entry" : [ {
-               "key" : {
-                  "name" : "task",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "task",
-                     "version" : "0.0.1"
-                  },
-                  "inputFields" : {
-                     "entry" : [ {
-                        "key" : "IEPAR0",
-                        "value" : {
-                           "key" : "IEPAR0",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem0",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     }, {
-                        "key" : "IEPAR1",
-                        "value" : {
-                           "key" : "IEPAR1",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem1",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     } ]
-                  },
-                  "outputFields" : {
-                     "entry" : [ {
-                        "key" : "OE0PAR0",
-                        "value" : {
-                           "key" : "OE0PAR0",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem0",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     }, {
-                        "key" : "OE0PAR1",
-                        "value" : {
-                           "key" : "OE0PAR1",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem1",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     }, {
-                        "key" : "OE1PAR0",
-                        "value" : {
-                           "key" : "OE1PAR0",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem0",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     }, {
-                        "key" : "OE1PAR1",
-                        "value" : {
-                           "key" : "OE1PAR1",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem1",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     } ]
-                  },
-                  "taskParameters" : {
-                     "entry" : [ {
-                        "key" : "taskParameter0",
-                        "value" : {
-                           "key" : {
-                              "parentKeyName" : "task",
-                              "parentKeyVersion" : "0.0.1",
-                              "parentLocalName" : "NULL",
-                              "localName" : "taskParameter0"
-                           },
-                           "defaultValue" : "Task parameter 0 value"
-                        }
-                     }, {
-                        "key" : "taskParameter1",
-                        "value" : {
-                           "key" : {
-                              "parentKeyName" : "task",
-                              "parentKeyVersion" : "0.0.1",
-                              "parentLocalName" : "NULL",
-                              "localName" : "taskParameter1"
-                           },
-                           "defaultValue" : "Task parameter 1 value"
-                        }
-                     } ]
-                  },
-                  "contextAlbumReference" : [ {
-                     "name" : "contextAlbum0",
-                     "version" : "0.0.1"
-                  }, {
-                     "name" : "contextAlbum1",
-                     "version" : "0.0.1"
-                  } ],
-                  "taskLogic" : {
-                     "key" : "taskLogic",
-                     "logicFlavour" : "MVEL",
-                     "logic" : "Some task logic"
-                  }
-               }
-            } ]
-         }
-      },
-      "events" : {
-         "key" : {
-            "name" : "events",
-            "version" : "0.0.1"
-         },
-         "eventMap" : {
-            "entry" : [ {
-               "key" : {
-                  "name" : "inEvent",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "inEvent",
-                     "version" : "0.0.1"
-                  },
-                  "nameSpace" : "org.onap.policy.apex.model.policymodel.events",
-                  "source" : "Source",
-                  "target" : "Target",
-                  "parameter" : {
-                     "entry" : [ {
-                        "key" : "IEPAR0",
-                        "value" : {
-                           "key" : "IEPAR0",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem0",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     }, {
-                        "key" : "IEPAR1",
-                        "value" : {
-                           "key" : "IEPAR1",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem1",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     } ]
-                  }
-               }
-            }, {
-               "key" : {
-                  "name" : "outEvent0",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "outEvent0",
-                     "version" : "0.0.1"
-                  },
-                  "nameSpace" : "org.onap.policy.apex.model.policymodel.events",
-                  "source" : "Source",
-                  "target" : "Target",
-                  "parameter" : {
-                     "entry" : [ {
-                        "key" : "OE0PAR0",
-                        "value" : {
-                           "key" : "OE0PAR0",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem0",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     }, {
-                        "key" : "OE0PAR1",
-                        "value" : {
-                           "key" : "OE0PAR1",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem1",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     }, {
-                        "key" : "OE1PAR0",
-                        "value" : {
-                           "key" : "OE1PAR0",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem0",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     }, {
-                        "key" : "OE1PAR1",
-                        "value" : {
-                           "key" : "OE1PAR1",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem1",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     } ]
-                  }
-               }
-            }, {
-               "key" : {
-                  "name" : "outEvent1",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "outEvent1",
-                     "version" : "0.0.1"
-                  },
-                  "nameSpace" : "org.onap.policy.apex.model.policymodel.events",
-                  "source" : "Source",
-                  "target" : "Target",
-                  "parameter" : {
-                     "entry" : [ {
-                        "key" : "OE1PAR0",
-                        "value" : {
-                           "key" : "OE1PAR0",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem0",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     }, {
-                        "key" : "OE1PAR1",
-                        "value" : {
-                           "key" : "OE1PAR1",
-                           "fieldSchemaKey" : {
-                              "name" : "eventContextItem1",
-                              "version" : "0.0.1"
-                           }
-                        }
-                     } ]
-                  }
-               }
-            } ]
-         }
-      },
-      "albums" : {
-         "key" : {
-            "name" : "context",
-            "version" : "0.0.1"
-         },
-         "albums" : {
-            "entry" : [ {
-               "key" : {
-                  "name" : "contextAlbum0",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "contextAlbum0",
-                     "version" : "0.0.1"
-                  },
-                  "scope" : "APPLICATION",
-                  "isWritable" : true,
-                  "itemSchema" : {
-                     "name" : "MapType",
-                     "version" : "0.0.1"
-                  }
-               }
-            }, {
-               "key" : {
-                  "name" : "contextAlbum1",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "contextAlbum1",
-                     "version" : "0.0.1"
-                  },
-                  "scope" : "GLOBAL",
-                  "isWritable" : false,
-                  "itemSchema" : {
-                     "name" : "StringType",
-                     "version" : "0.0.1"
-                  }
-               }
-            } ]
-         }
-      },
-      "schemas" : {
-         "key" : {
-            "name" : "ContextSchemas",
-            "version" : "0.0.1"
-         },
-         "schemas" : {
-            "entry" : [ {
-               "key" : {
-                  "name" : "MapType",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "MapType",
-                     "version" : "0.0.1"
-                  },
-                  "schemaFlavour" : "Java",
-                  "schemaDefinition" : "org.onap.policy.apex.model.policymodel.concepts.TestContextItem00A"
-               }
-            }, {
-               "key" : {
-                  "name" : "StringType",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "StringType",
-                     "version" : "0.0.1"
-                  },
-                  "schemaFlavour" : "Java",
-                  "schemaDefinition" : "org.onap.policy.apex.model.policymodel.concepts.TestContextItem000"
-               }
-            }, {
-               "key" : {
-                  "name" : "eventContextItem0",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "eventContextItem0",
-                     "version" : "0.0.1"
-                  },
-                  "schemaFlavour" : "Java",
-                  "schemaDefinition" : "java.lang.String"
-               }
-            }, {
-               "key" : {
-                  "name" : "eventContextItem1",
-                  "version" : "0.0.1"
-               },
-               "value" : {
-                  "key" : {
-                     "name" : "eventContextItem1",
-                     "version" : "0.0.1"
-                  },
-                  "schemaFlavour" : "Java",
-                  "schemaDefinition" : "java.lang.Long"
-               }
-            } ]
-         }
-      }
-   }
-}
\ No newline at end of file
diff --git a/client/client-full/pom.xml b/client/client-full/pom.xml
index 0f3842769..2bd8e1476 100644
--- a/client/client-full/pom.xml
+++ b/client/client-full/pom.xml
@@ -35,11 +35,6 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.policy.apex-pdp.client</groupId>
-            <artifactId>apex-client-editor</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.client</groupId>
             <artifactId>apex-client-monitoring</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/client/client-full/src/main/resources/webapp/index.html b/client/client-full/src/main/resources/webapp/index.html
index 62069b11f..f445368cb 100644
--- a/client/client-full/src/main/resources/webapp/index.html
+++ b/client/client-full/src/main/resources/webapp/index.html
@@ -71,14 +71,6 @@
                         <div class="GradientBlock-title">Apex Monitoring</div>
                         <div class="GradientBlock-desc">Monitor Apex Engines</div>
                     </div>
-                </a> <a id="banner_editor" href="editor/"
-                    class="GradientBlock GradientBlock_gradient_blue banner">
-                    <div class="GradientBlock-icon GradientBlock-icon_icon_note"></div>
-                    <div class="GradientBlock-content">
-                        <div class="GradientBlock-title">Policy Editor</div>
-                        <div class="GradientBlock-desc">Create and Edit Apex
-                            Policies</div>
-                    </div>
                 </a> <a id="banner_deploy" href="deployment/"
                     class="GradientBlock GradientBlock_gradient_purple banner">
                     <div class="GradientBlock-icon GradientBlock-icon_icon_deploy"></div>
diff --git a/client/pom.xml b/client/pom.xml
index a681da785..1042ba67b 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -36,7 +36,6 @@
         <module>client-common</module>
         <module>client-monitoring</module>
         <module>client-deployment</module>
-        <module>client-editor</module>
         <module>client-full</module>
     </modules>
 </project>