Merge branch 'develop'

Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml

wise-webapp/pom.xml

@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>3.0.4</version>
+        <version>4.0.0</version>
     </parent>
 
     <repositories>
@@ -306,6 +306,11 @@
             <artifactId>swagger-annotations_2.9.1</artifactId>
             <version>1.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+        </dependency>
 
     </dependencies>
     <profiles>
@@ -464,8 +469,9 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.1.1</version>
+                <version>2.4</version>
                 <configuration>
                     <warName>wisemapping</warName>
                     <overlays>
@@ -482,6 +488,9 @@
                                 <include>**/*.jpg</include>
                                 <include>**/*.less</include>
                                 <include>js/editor.js</include>
+                                <include>js/hotkeys.js</include>
+                                <include>js/jquery-mousewheel.js</include>
+                                <include>js/underscore.js</include>
                             </includes>
                         </overlay>
                         <overlay>
@@ -551,6 +560,7 @@
                 <artifactId>jetty-maven-plugin</artifactId>
                 <version>8.1.14.v20131031</version>
                 <configuration>
+                    <baseAppFirst>false</baseAppFirst>
                     <stopKey>foo</stopKey>
                     <stopPort>9999</stopPort>
                     <war>${project.build.directory}/wisemapping.war</war>