Merge remote-tracking branch 'origin/develop' into feature/remove_mootols

Conflicts:
	mindplot/src/main/javascript/widget/LinkIconTooltip.js
	pom.xml

pom.xml

@@ -8,6 +8,10 @@
         <superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
     </properties>
 
+    <scm>
+        <developerConnection>scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git</developerConnection>
+    </scm>
+
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wisemapping</groupId>
     <artifactId>wisemapping</artifactId>
@@ -94,6 +98,9 @@
                     <groupId>com.github.searls</groupId>
                     <artifactId>jasmine-maven-plugin</artifactId>
                     <version>1.3.1.5</version>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -178,6 +185,15 @@
                     </reportPlugins>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>external.atlassian.jgitflow</groupId>
+                <artifactId>jgitflow-maven-plugin</artifactId>
+                <version>1.0-m4.3</version>
+                <configuration>
+                    <masterBranchName>master</masterBranchName>
+                    <developBranchName>develop</developBranchName>
+                </configuration>
+            </plugin>
         </plugins>
     </build>