BS-7207
[6.2.2] .bar file importation from 5.10.2 failed due to icon in
connector descriptor
BS-7054
[6.2.1] Unable to use process variables in overview form transient data
scripts

Conflicts:
	bundles/plugins/org.bonitasoft.studio.connectors.model.edit/src/org/bonitasoft/studio/connector/model/definition/wizard/AbstractConnectorConfigurationWizardPage.java
	bundles/plugins/org.bonitasoft.studio.connectors/src/org/bonitasoft/studio/connectors/expression/ConnectorOutputExpressionEditor.java
	bundles/plugins/org.bonitasoft.studio.data/src/org/bonitasoft/studio/data/provider/JavaExpressionEditor.java
	bundles/plugins/org.bonitasoft.studio.data/src/org/bonitasoft/studio/data/ui/property/section/AbstractDataSection.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/formfield/FormFieldExpressionEditor.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/message/MessageIdExpressionEditor.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/operation/PropertyOperationsComposite.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/operation/WizardPageOperationsComposite.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/viewer/ExpressionCollectionViewer.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/viewer/ExpressionViewer.java
	bundles/plugins/org.bonitasoft.studio.groovy.ui/src/org/bonitasoft/studio/groovy/ui/providers/GroovyScriptExpressionEditor.java
	bundles/plugins/org.bonitasoft.studio.properties/src/org/bonitasoft/studio/properties/sections/transientdata/ApplicationTransientDataSection.java
	bundles/plugins/org.bonitasoft.studio.properties/src/org/bonitasoft/studio/properties/sections/transientdata/OverviewPageFlowTransientDataSection.java
	bundles/plugins/org.bonitasoft.studio.properties/src/org/bonitasoft/studio/properties/sections/transientdata/ViewPageFlowTransientDataSection.java
	bundles/plugins/org.bonitasoft.studio.scripting/src/org/bonitasoft/studio/scripting/provider/ScriptExpressionEditor.java
	bundles/plugins/org.bonitasoft.studio.simulation/src/org/bonitasoft/studio/simulation/expression/SimulationDataExpressionEditor.java
	bundles/plugins/org.bonitasoft.studio.xml/src/org/bonitasoft/studio/xml/ui/XPathExpressionEditor.java
Merge remote-tracking branch 'origin/master' into MasterBugFixing

Conflicts:
	bundles/plugins/org.bonitasoft.studio.diagram.form/.classpath
	bundles/plugins/org.bonitasoft.studio.diagram/.classpath
	bundles/plugins/org.bonitasoft.studio.model.edit/.classpath
	bundles/plugins/org.bonitasoft.studio.model/.classpath
Merge branch 'master' into 'MasterBugFixing'
BS-7350
Update referenced widget with new modifier type
BS-7350
Update referenced widget with new modifier type tests
BS-7480
CLONE - multiple value widget with empty_list generates an error at
runtime
Add model.assertions to fasten unit test development and readability
Migrate to assertj
Add ExpressionHelper.createEmptyListExpression
change product.version value
BS-7276
Fix npe

Conflicts:
	bundles/plugins/org.bonitasoft.studio.properties/src/org/bonitasoft/studio/properties/sections/forms/commands/DuplicateFormCommand.java
BS-6942
Export display name, description and description after completion for
Gateways
BS-7260
Remove unused references from model.
update 6.3.0 branding
BS-7210
Copy custom form template in new diagram application resource and update
referenced path
BS-7210
Update reference ids in template
Fix resize pool handle
BS-6936
Hide gateway label if not a display name
fix npe if import failed
BS-6936
Hide gateway label if not a display name