Merge branch 'master' into sdk-3.0

<!--

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 -->

		 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>

          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. -->

    <import resource="classpath:alfresco/module/${project.artifactId}/context/service-context.xml" />

	<!-- 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/webscript-context.xml" />

</beans>

::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

::      Dev environment startup script for Alfresco Community     ::

::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

@echo off

@ECHO OFF

set MAVEN_OPTS=-Xms256m -Xmx2G

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

#!/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