diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..d6b6ded1
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,67 @@
+<!--
+
+If you are reporting a new issue, make sure that we do not have any duplicates
+already open. You can ensure this by searching the issue list for this
+repository. If there is a duplicate, please close your issue and add a comment
+to the existing issue instead.
+
+If you suspect your issue is a bug, please edit your issue description to
+include the BUG REPORT INFORMATION shown below. If you fail to provide this
+information within 7 days, we cannot debug your issue and will close it. We
+will, however, reopen it if you later provide the information.
+
+---------------------------------------------------
+GENERAL SUPPORT INFORMATION
+---------------------------------------------------
+
+The GitHub issue tracker is for bug reports and feature requests.
+General support can be found at the following locations:
+
+- Alfresco Community - https://community.alfresco.com/community/ecm
+- Post a question on StackOverflow, using the Alfresco tag
+
+-->
+
+
+## I'm submitting a ...   (check one with "x")
+```
+[ ] bug report => search github for a similar issue or PR before submitting
+[ ] feature request
+```
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Expected Behavior
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+5.
+
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Alfresco SDK version used: <!-- 2.1 / 2.2 / 3.0betaX-->
+* Alfresco version used: <!-- Enterprise 5.1, Community 5.0.f or ...-->
+* Output of command 'mvn -version': <!-- Maven/JDK version--> 
+* Link to your project: <!-- optional for having a minimal example-->
+
+## Additional information
+<!-- include screenshots or any other hint you mave have for us -->
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml
index 213c961a..f0a7fa98 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml
@@ -11,7 +11,7 @@
 		 workflow, and loading custom content models.  -->
 
     <!-- Registration of new models -->
-    <bean id="${package}.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+    <bean id="${artifactId}.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
         <property name="models">
             <list>
                 <value>alfresco/module/${project.artifactId}/model/content-model.xml</value>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml
index cfa0e02a..9e87de82 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml
@@ -1,28 +1,28 @@
 #set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
-	Licensed to the Apache Software Foundation (ASF) under one or more
-	contributor license agreements.  See the NOTICE file distributed with
-	this work for additional information regarding copyright ownership.
-	The ASF licenses this file to You 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.
--->
+        #set( $symbol_dollar = '$' )
+        #set( $symbol_escape = '\' )
+        <?xml version='1.0' encoding='UTF-8'?>
+        <!--
+            Licensed to the Apache Software Foundation (ASF) under one or more
+            contributor license agreements.  See the NOTICE file distributed with
+            this work for additional information regarding copyright ownership.
+            The ASF licenses this file to You 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.
+        -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-    
+
     <!-- A simple class that is initialized by Spring -->
     <bean id="${package}.Demo" class="${package}.platformsample.Demo" init-method="init" />
 
@@ -40,5 +40,5 @@
         <property name="nodeLocatorService" ref="nodeLocatorService" />
     </bean>
 
-    
+
 </beans>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/module-context.xml
index 745054c3..ef2fa267 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/module-context.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/module-context.xml
@@ -22,8 +22,11 @@
           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
 	<!-- This is filtered by Maven at build time, so that module name is single sourced. -->
+	<!-- Note. The bootstrap-context.xml file has to be loaded first.
+				Otherwise your custom models are not yet loaded when your service beans are instantiated and you
+				cannot for example register policies on them. -->
+	<import resource="classpath:alfresco/module/${project.artifactId}/context/bootstrap-context.xml" />
     <import resource="classpath:alfresco/module/${project.artifactId}/context/service-context.xml" />
-    <import resource="classpath:alfresco/module/${project.artifactId}/context/bootstrap-context.xml" />
 	<import resource="classpath:alfresco/module/${project.artifactId}/context/webscript-context.xml" />
 
 </beans>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.bat b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.bat
index 70f01448..f71c66d4 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.bat
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.bat
@@ -1,9 +1,12 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::      Dev environment startup script for Alfresco Community     ::
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-@echo off
+@ECHO OFF
 
-set MAVEN_OPTS=-Xms256m -Xmx2G
-
-mvnDebug clean install alfresco:run
+IF "%MAVEN_OPTS%" == "" (
+    ECHO The environment variable 'MAVEN_OPTS' is not set, setting it for you
+    SET MAVEN_OPTS=-Xms256m -Xmx2G
+)
+ECHO MAVEN_OPTS is set to '%MAVEN_OPTS%'
 
+mvnDebug clean install alfresco:run
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.sh
index c8f887ea..77643330 100755
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.sh
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/debug.sh
@@ -1,3 +1,7 @@
 #!/bin/bash
-
-MAVEN_OPTS="-Xms256m -Xmx2G" mvnDebug clean install alfresco:run
+if [[ -z ${MAVEN_OPTS} ]]; then
+    echo "The environment variable 'MAVEN_OPTS' is not set, setting it for you";
+    MAVEN_OPTS="-Xms256m -Xmx2G"
+fi
+echo "MAVEN_OPTS is set to '$MAVEN_OPTS'";
+mvnDebug clean install alfresco:run
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat
index a777e719..08c09dc2 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat
@@ -1,9 +1,12 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::      Dev environment startup script for Alfresco Community     ::
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-@echo off
+@ECHO OFF
 
-set MAVEN_OPTS=-Xms256m -Xmx2G
-
-mvn clean install alfresco:run
+IF "%MAVEN_OPTS%" == "" (
+    ECHO The environment variable 'MAVEN_OPTS' is not set, setting it for you
+    SET MAVEN_OPTS=-Xms256m -Xmx2G
+)
+ECHO MAVEN_OPTS is set to '%MAVEN_OPTS%'
 
+mvn clean install alfresco:run
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh
index 8522beb1..9515fe61 100755
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh
@@ -1,3 +1,7 @@
 #!/bin/bash
-
-MAVEN_OPTS="-Xms256m -Xmx2G" mvn clean install alfresco:run
+if [[ -z ${MAVEN_OPTS} ]]; then
+    echo "The environment variable 'MAVEN_OPTS' is not set, setting it for you";
+    MAVEN_OPTS="-Xms256m -Xmx2G"
+fi
+echo "MAVEN_OPTS is set to '$MAVEN_OPTS'";
+mvn clean install alfresco:run
\ No newline at end of file
diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml
index 213c961a..f0a7fa98 100644
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml
@@ -11,7 +11,7 @@
 		 workflow, and loading custom content models.  -->
 
     <!-- Registration of new models -->
-    <bean id="${package}.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+    <bean id="${artifactId}.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
         <property name="models">
             <list>
                 <value>alfresco/module/${project.artifactId}/model/content-model.xml</value>
diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/module-context.xml
index 4d6eb22b..f0e3a351 100644
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/module-context.xml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/module-context.xml
@@ -21,8 +21,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
     <!-- This is filtered by Maven at build time, so that module name is single sourced. -->
+	<!-- Note. The bootstrap-context.xml file has to be loaded first.
+				Otherwise your custom models are not yet loaded when your service beans are instantiated and you
+				cannot for example register policies on them. -->
+	<import resource="classpath:alfresco/module/${project.artifactId}/context/bootstrap-context.xml" />
     <import resource="classpath:alfresco/module/${project.artifactId}/context/service-context.xml" />
-    <import resource="classpath:alfresco/module/${project.artifactId}/context/bootstrap-context.xml" />
 	<import resource="classpath:alfresco/module/${project.artifactId}/context/webscript-context.xml" />
 
 </beans>
diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/__artifactId__-slingshot-application-context.xml b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/__artifactId__-slingshot-application-context.xml
index 277751fa..22741e02 100644
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/__artifactId__-slingshot-application-context.xml
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/__artifactId__-slingshot-application-context.xml
@@ -17,7 +17,7 @@
    -->
 
    <!-- Add module specific messages and labels -->
-   <bean id="${package}.${artifactId}.resources"
+   <bean id="${artifactId}.resources"
          class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
       <property name="resourceBundles">
          <list>
diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml
index f3c28451..0ced37cf 100644
--- a/modules/alfresco-rad/pom.xml
+++ b/modules/alfresco-rad/pom.xml
@@ -1,42 +1,42 @@
 <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>
-  
-  <artifactId>alfresco-rad</artifactId>
-  <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
 
-  <name>Rapid Application Development Support</name>
-  <description>SDK module for Rapid Development support, such as Alfresco JUnit runner</description>
+    <artifactId>alfresco-rad</artifactId>
+    <packaging>jar</packaging>
 
-  <parent>
-      <groupId>org.alfresco.maven</groupId>
-      <artifactId>alfresco-sdk-aggregator</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-      <relativePath>../../pom.xml</relativePath>
-  </parent>
+    <name>Rapid Application Development Support</name>
+    <description>SDK module for Rapid Development support, such as Alfresco JUnit runner</description>
 
-  <dependencies>
-      <!-- Access to org.alfresco.service.ServiceRegistry -->
-      <dependency>
-          <groupId>org.alfresco</groupId>
-          <artifactId>alfresco-repository</artifactId>
-          <version>${alfresco.community.default.version}</version>
-          <scope>provided</scope>
-      </dependency>
+    <parent>
+        <groupId>org.alfresco.maven</groupId>
+        <artifactId>alfresco-sdk-aggregator</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
 
-      <!-- Bring in ApplicationContextAware, ApplicationContext etc -->
-      <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-context</artifactId>
-          <version>3.2.17.RELEASE</version>
-      </dependency>
+    <dependencies>
+        <!-- Access to org.alfresco.service.ServiceRegistry -->
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-repository</artifactId>
+            <version>${alfresco.community.default.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
-      <!-- Access to JUnit runner classes -->
-      <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>4.12</version>
-      </dependency>
+        <!-- Bring in ApplicationContextAware, ApplicationContext etc -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>3.2.17.RELEASE</version>
+        </dependency>
 
-  </dependencies>
+        <!-- Access to JUnit runner classes -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+
+    </dependencies>
 
 </project>
diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml
index 628b128b..4874407d 100644
--- a/plugins/alfresco-maven-plugin/pom.xml
+++ b/plugins/alfresco-maven-plugin/pom.xml
@@ -1,162 +1,162 @@
 <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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.alfresco.maven.plugin</groupId>
-  <artifactId>alfresco-maven-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <name>Maven Alfresco Plugin</name>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.alfresco.maven.plugin</groupId>
+    <artifactId>alfresco-maven-plugin</artifactId>
+    <packaging>maven-plugin</packaging>
+    <name>Maven Alfresco Plugin</name>
 
-  <parent>
-      <groupId>org.alfresco.maven</groupId>
-      <artifactId>alfresco-sdk-aggregator</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-      <relativePath>../../pom.xml</relativePath>
-  </parent>
+    <parent>
+        <groupId>org.alfresco.maven</groupId>
+        <artifactId>alfresco-sdk-aggregator</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.5</version>
-        <executions>
-          <execution>
-            <id>generated-helpmojo</id>
-            <goals>
-              <goal>helpmojo</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-    	<plugins>
-    		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-    		<plugin>
-    			<groupId>org.eclipse.m2e</groupId>
-    			<artifactId>lifecycle-mapping</artifactId>
-    			<version>1.0.0</version>
-    			<configuration>
-    				<lifecycleMappingMetadata>
-    					<pluginExecutions>
-    						<pluginExecution>
-    							<pluginExecutionFilter>
-    								<groupId>
-    									org.apache.maven.plugins
-    								</groupId>
-    								<artifactId>
-    									maven-plugin-plugin
-    								</artifactId>
-    								<versionRange>[3.2,)</versionRange>
-    								<goals>
-    									<goal>helpmojo</goal>
-    									<goal>descriptor</goal>
-    								</goals>
-    							</pluginExecutionFilter>
-    							<action>
-    								<ignore />
-    							</action>
-    						</pluginExecution>
-    					</pluginExecutions>
-    				</lifecycleMappingMetadata>
-    			</configuration>
-    		</plugin>
-    	</plugins>
-    </pluginManagement>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <version>3.5</version>
+                <executions>
+                    <execution>
+                        <id>generated-helpmojo</id>
+                        <goals>
+                            <goal>helpmojo</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.apache.maven.plugins
+                                        </groupId>
+                                        <artifactId>
+                                            maven-plugin-plugin
+                                        </artifactId>
+                                        <versionRange>[3.2,)</versionRange>
+                                        <goals>
+                                            <goal>helpmojo</goal>
+                                            <goal>descriptor</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>3.2.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.5</version>
-      <!-- Annotations are not needed for plugin execution so you
-           can remove this dependency for execution by using provided scope. -->
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-archiver</artifactId>
-      <version>3.1.1</version>
-      <exclusions>
-        <exclusion>
-            <artifactId>maven-core</artifactId>
+    <dependencies>
+        <dependency>
             <groupId>org.apache.maven</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-archiver</artifactId>
-      <version>3.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>3.2.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>3.2.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.5.3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-      <version>3.6</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-mmt</artifactId>
-      <version>5.1.g</version>
-    </dependency>
-    <dependency>
-        <groupId>org.alfrescolabs.alfresco-technical-validation</groupId>
-        <artifactId>org.alfrescolabs.alfresco-technical-validation</artifactId>
-        <version>0.4.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.twdata.maven</groupId>
-      <artifactId>mojo-executor</artifactId>
-      <version>2.2.0</version>
-    </dependency>
-    <!-- ZIP directories in an easy way -->
-    <dependency>
-      <groupId>org.zeroturnaround</groupId>
-      <artifactId>zt-zip</artifactId>
-      <version>1.11</version>
-    </dependency>
-  </dependencies>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>3.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugin-tools</groupId>
+            <artifactId>maven-plugin-annotations</artifactId>
+            <version>3.5</version>
+            <!-- Annotations are not needed for plugin execution so you
+                 can remove this dependency for execution by using provided scope. -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-archiver</artifactId>
+            <version>3.1.1</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>maven-core</artifactId>
+                    <groupId>org.apache.maven</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-archiver</artifactId>
+            <version>3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>3.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>3.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>3.6</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-mmt</artifactId>
+            <version>5.1.g</version>
+        </dependency>
+        <dependency>
+            <groupId>org.alfrescolabs.alfresco-technical-validation</groupId>
+            <artifactId>org.alfrescolabs.alfresco-technical-validation</artifactId>
+            <version>0.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.twdata.maven</groupId>
+            <artifactId>mojo-executor</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+        <!-- ZIP directories in an easy way -->
+        <dependency>
+            <groupId>org.zeroturnaround</groupId>
+            <artifactId>zt-zip</artifactId>
+            <version>1.11</version>
+        </dependency>
+    </dependencies>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.5</version>
-      </plugin>
-    </plugins>
-  </reporting>
-  
-  <repositories>
-    <!-- Used for the ATV donwload -->
-    <repository>
-      <id>clojars.org</id>
-      <url>http://clojars.org/repo</url>
-    </repository>
-  </repositories>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <version>3.5</version>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <repositories>
+        <!-- Used for the ATV donwload -->
+        <repository>
+            <id>clojars.org</id>
+            <url>http://clojars.org/repo</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java
index ceb86754..b53e25a4 100644
--- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java
+++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java
@@ -46,7 +46,7 @@ public class InstallMojo extends AbstractMojo {
     /**
      * The location of the AMP file(s) to be installed. If this location is a
      * folder all AMPs contained in the folder are installed, if it's a file it
-     * get direclty installed on the ${warLocation}
+     * get directly installed on the ${warLocation}
      * 
      * @parameter property="maven.alfresco.ampLocation" default-value="${project.build.directory}/${project.build.finalName}.amp"
      */
@@ -54,9 +54,9 @@ public class InstallMojo extends AbstractMojo {
     
     /**
      * The WAR file or exploded dir to install the AMPs in. If specified
-     * Defaults to <code>"${project.build.directory}/${project.build.finalName}-war</code>
-     * 
-     * @parameter property="maven.alfresco.warLocation" default-value="${project.build.directory}/${project.build.finalName}-war"
+     * Defaults to <code>"${app.amp.client.war.folder}</code>
+     *
+     * @parameter property="maven.alfresco.warLocation" default-value="${app.amp.client.war.folder}"
      */
     private File warLocation;
     
diff --git a/plugins/alfresco-maven-plugin/src/site/apt/index.apt.vm b/plugins/alfresco-maven-plugin/src/site/apt/index.apt.vm
index eaab0bd9..1a0e441c 100644
--- a/plugins/alfresco-maven-plugin/src/site/apt/index.apt.vm
+++ b/plugins/alfresco-maven-plugin/src/site/apt/index.apt.vm
@@ -18,7 +18,7 @@ Introduction
 
   *{{{./install-mojo.html}alfresco:install}} Installs one or multiple AMPs into an Alfresco WAR / exploded WAR folder embedding {{{http://wiki.alfresco.com/wiki/Module_Management_Tool} Alfresco MMT}} 
   
-  *{{{./set-version-mojo.html}alfresco:version}} Parses ${project.version} removing literals (for AMP compatibility) and making the <<<$\{noSnapshotVersion\}>>> property available in the POM
+  *{{{./set-version-mojo.html}alfresco:version}} Parses <<<$\{project.version\}>>> removing literals (for AMP compatibility) and making the <<<$\{noSnapshotVersion\}>>> property available in the POM
 
  Full information is available at the {{{./plugin-info.html}goals page}}.
 
diff --git a/pom.xml b/pom.xml
index e1127413..12517960 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,7 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-webdav-jackrabbit</artifactId>
-                <version>2.2</version>
+                <version>2.10</version>
             </extension>
         </extensions>
     </build>
@@ -324,6 +324,7 @@
                 </plugins>
             </reporting>
         </profile>
+
         <!-- Attempt (failed) to retain run.sh permissions. Zip files are bad at this, full stop.
         <profile>
             <id>set-executables-permissions</id>
diff --git a/src/site/site.xml b/src/site/site.xml
index 1645eba4..7abf858b 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -9,7 +9,7 @@
           <topBarIcon>
             <name>Alfresco Software</name>
             <alt>Alfresco Software</alt>
-            <src>http://people.apache.org/~gabriele/Alfresco-logo-transparent-thin.png</src>
+            <src>https://wiki.alfresco.com/skins/alfresco/community_theme/alfresco-org-logo.png</src>
             <href>http://www.alfresco.com</href>
           </topBarIcon>
           <topBarEnabled>true</topBarEnabled>