Conflicts:
	bundles/features/studio-feature/feature.xml
	bundles/plugins/org.bonitasoft.studio-models/process.history
	bundles/plugins/org.bonitasoft.studio.actors/src/org/bonitasoft/studio/actors/ui/wizard/RefactorActorMappingsOperation.java
	bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/actions/wizards/ImportFileWizard.java
	bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/actions/wizards/ImportFileWizardPage.java
	bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/coolbar/ImportBarCoolbarItem.java
	bundles/plugins/org.bonitasoft.studio.common.repository/.classpath
	bundles/plugins/org.bonitasoft.studio.common.repository/messages.properties
	bundles/plugins/org.bonitasoft.studio.common.repository/src/org/bonitasoft/studio/common/repository/MANIFEST.MF.template
	bundles/plugins/org.bonitasoft.studio.common.repository/src/org/bonitasoft/studio/common/repository/filestore/AbstractFileStore.java
	bundles/plugins/org.bonitasoft.studio.common.repository/src/org/bonitasoft/studio/common/repository/filestore/EMFFileStore.java
	bundles/plugins/org.bonitasoft.studio.common.repository/src/org/bonitasoft/studio/common/repository/filestore/PackageFileStore.java
	bundles/plugins/org.bonitasoft.studio.common.repository/src/org/bonitasoft/studio/common/repository/store/AbstractEMFRepositoryStore.java
	bundles/plugins/org.bonitasoft.studio.common/.classpath
	bundles/plugins/org.bonitasoft.studio.common/dataTypes.properties
	bundles/plugins/org.bonitasoft.studio.common/pom.xml
	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/DataTypeLabels.java
	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/DataUtil.java
	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/NamingUtils.java
	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/emf/tools/ModelHelper.java
	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/jface/DataStyledTreeLabelProvider.java
	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/jface/FileActionDialog.java
	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/log/BonitaStudioLog.java
	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/platform/tools/PlatformUtil.java
	bundles/plugins/org.bonitasoft.studio.configuration/src/org/bonitasoft/studio/configuration/ui/wizard/page/AbstractDependenciesConfigurationWizardPage.java
	bundles/plugins/org.bonitasoft.studio.connectors.model.edit/messages.properties
	bundles/plugins/org.bonitasoft.studio.connectors/messages.properties
	bundles/plugins/org.bonitasoft.studio.connectors/src/org/bonitasoft/studio/connectors/configuration/ConnectorBarResourceProvider.java
	bundles/plugins/org.bonitasoft.studio.connectors/src/org/bonitasoft/studio/connectors/i18n/Messages.java
	bundles/plugins/org.bonitasoft.studio.connectors/src/org/bonitasoft/studio/connectors/repository/ExportConnectorArchiveOperation.java
	bundles/plugins/org.bonitasoft.studio.data/src/org/bonitasoft/studio/data/provider/DocumentExpressionEditor.java
	bundles/plugins/org.bonitasoft.studio.dependencies/.classpath
	bundles/plugins/org.bonitasoft.studio.dependencies/.settings/org.eclipse.jdt.core.prefs
	bundles/plugins/org.bonitasoft.studio.dependencies/messages.properties
	bundles/plugins/org.bonitasoft.studio.dependencies/pom.xml
	bundles/plugins/org.bonitasoft.studio.dependencies/src/org/bonitasoft/studio/dependencies/classpath/UserDependenciesContainer.java
	bundles/plugins/org.bonitasoft.studio.dependencies/src/org/bonitasoft/studio/dependencies/i18n/Messages.java
	bundles/plugins/org.bonitasoft.studio.dependencies/src/org/bonitasoft/studio/dependencies/repository/DependencyFileStore.java
	bundles/plugins/org.bonitasoft.studio.dependencies/src/org/bonitasoft/studio/dependencies/repository/DependencyRepositoryStore.java
	bundles/plugins/org.bonitasoft.studio.dependencies/src/org/bonitasoft/studio/dependencies/ui/MissingDependenciesDecorator.java
	bundles/plugins/org.bonitasoft.studio.diagram.custom/messages.properties
	bundles/plugins/org.bonitasoft.studio.diagram.custom/src/org/bonitasoft/studio/diagram/custom/Messages.java
	bundles/plugins/org.bonitasoft.studio.diagram.custom/src/org/bonitasoft/studio/diagram/custom/commands/NewDiagramCommandHandler.java
	bundles/plugins/org.bonitasoft.studio.diagram.custom/src/org/bonitasoft/studio/diagram/custom/repository/DiagramRepositoryStore.java
	bundles/plugins/org.bonitasoft.studio.diagram.form.custom/.classpath
	bundles/plugins/org.bonitasoft.studio.engine/src/org/bonitasoft/studio/engine/export/BarExporter.java
	bundles/plugins/org.bonitasoft.studio.engine/src/org/bonitasoft/studio/engine/export/DesignProcessDefinitionBuilder.java
	bundles/plugins/org.bonitasoft.studio.engine/src/org/bonitasoft/studio/engine/export/switcher/AbstractSwitch.java
	bundles/plugins/org.bonitasoft.studio.engine/src/org/bonitasoft/studio/engine/export/switcher/DataSwitch.java
	bundles/plugins/org.bonitasoft.studio.examples/.classpath
	bundles/plugins/org.bonitasoft.studio.examples/.project
	bundles/plugins/org.bonitasoft.studio.examples/.settings/org.eclipse.jdt.core.prefs
	bundles/plugins/org.bonitasoft.studio.examples/META-INF/MANIFEST.MF
	bundles/plugins/org.bonitasoft.studio.examples/build.properties
	bundles/plugins/org.bonitasoft.studio.examples/messages.properties
	bundles/plugins/org.bonitasoft.studio.examples/plugin.xml
	bundles/plugins/org.bonitasoft.studio.examples/pom.xml
	bundles/plugins/org.bonitasoft.studio.examples/src/org/bonitasoft/studio/examples/ExamplePlugin.java
	bundles/plugins/org.bonitasoft.studio.examples/src/org/bonitasoft/studio/examples/i18n/Messages.java
	bundles/plugins/org.bonitasoft.studio.examples/src/org/bonitasoft/studio/examples/store/ExampleFileStore.java
	bundles/plugins/org.bonitasoft.studio.examples/src/org/bonitasoft/studio/examples/store/ExamplesRepositoryStore.java
	bundles/plugins/org.bonitasoft.studio.examples/src/org/bonitasoft/studio/examples/wizard/ExampleContentProvider.java
	bundles/plugins/org.bonitasoft.studio.examples/src/org/bonitasoft/studio/examples/wizard/OpenExampleWizardPage.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/.classpath
	bundles/plugins/org.bonitasoft.studio.expression.editor/messages.properties
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/i18n/Messages.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/operation/OperationReturnTypesValidator.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/operation/OperatorLabelProvider.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/operation/OperatorSelectionDialog.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/operation/OperatorsContentProvider.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/viewer/ExpressionViewer.java
	bundles/plugins/org.bonitasoft.studio.importer.bar/models/v60/process.history
	bundles/plugins/org.bonitasoft.studio.importer.bar/src/org/bonitasoft/studio/importer/bar/factory/BarImporterFactory.java
	bundles/plugins/org.bonitasoft.studio.importer.bar/src/org/bonitasoft/studio/importer/bar/processor/EdaptBarToProcProcessor.java
	bundles/plugins/org.bonitasoft.studio.importer.bos/src/org/bonitasoft/studio/importer/bar/factory/BosArchiveImporterFactory.java
	bundles/plugins/org.bonitasoft.studio.importer.bos/src/org/bonitasoft/studio/importer/bar/factory/BosArchiveProcessor.java
	bundles/plugins/org.bonitasoft.studio.importer/.settings/org.eclipse.jdt.core.prefs
	bundles/plugins/org.bonitasoft.studio.importer/META-INF/MANIFEST.MF
	bundles/plugins/org.bonitasoft.studio.importer/messages.properties
	bundles/plugins/org.bonitasoft.studio.importer/plugin.properties
	bundles/plugins/org.bonitasoft.studio.importer/plugin.xml
	bundles/plugins/org.bonitasoft.studio.importer/src/org/bonitasoft/studio/importer/Activator.java
	bundles/plugins/org.bonitasoft.studio.importer/src/org/bonitasoft/studio/importer/ImporterFactory.java
	bundles/plugins/org.bonitasoft.studio.importer/src/org/bonitasoft/studio/importer/ImporterRegistry.java
	bundles/plugins/org.bonitasoft.studio.importer/src/org/bonitasoft/studio/importer/Messages.java
	bundles/plugins/org.bonitasoft.studio.importer/src/org/bonitasoft/studio/importer/ToProcProcessor.java
	bundles/plugins/org.bonitasoft.studio.importer/src/org/bonitasoft/studio/importer/bonita4/XPDLToProcFactory.java
	bundles/plugins/org.bonitasoft.studio.importer/src/org/bonitasoft/studio/importer/bpmn/BPMNToProcFactory.java
	bundles/plugins/org.bonitasoft.studio.intro/src/org/bonitasoft/studio/intro/Messages.java
	bundles/plugins/org.bonitasoft.studio.intro/src/org/bonitasoft/studio/intro/actions/ImportAction.java
	bundles/plugins/org.bonitasoft.studio.intro/src/org/bonitasoft/studio/intro/actions/OpenSpecificExampleAction.java
	bundles/plugins/org.bonitasoft.studio.intro/src/org/bonitasoft/studio/intro/actions/OpenSpecificProcessAction.java
	bundles/plugins/org.bonitasoft.studio.intro/src/org/bonitasoft/studio/intro/content/ProcessExampleContentProvider.java
	bundles/plugins/org.bonitasoft.studio.intro/src/org/bonitasoft/studio/intro/content/RecentProcessContentProvider.java
	bundles/plugins/org.bonitasoft.studio.jpdl/src/org/bonitasoft/studio/importer/jpdl/JBPM3ImportFactory.java
	bundles/plugins/org.bonitasoft.studio.jpdl/src/org/bonitasoft/studio/importer/jpdl/JBPM3ToProc.java
	bundles/plugins/org.bonitasoft.studio.preferences/plugin.properties
	bundles/plugins/org.bonitasoft.studio.properties/src/org/bonitasoft/studio/properties/sections/forms/commands/AddFormCommand.java
	bundles/plugins/org.bonitasoft.studio.properties/src/org/bonitasoft/studio/properties/sections/forms/commands/DuplicateFormCommand.java
	bundles/plugins/org.bonitasoft.studio.properties/src/org/bonitasoft/studio/properties/sections/forms/wizard/FormWizardPageVars.java
	bundles/plugins/org.bonitasoft.studio.repository.themes/src/org/bonitasoft/studio/repository/themes/LookNFeelFileStore.java
	bundles/plugins/org.bonitasoft.studio.validation/META-INF/MANIFEST.MF
	patched-plugins/org.eclipse.ui.browser/pom.xml
	pom.xml
	tests/org.bonitasoft.studio.diagram.form.custom.tests/META-INF/MANIFEST.MF
	tests/org.bonitasoft.studio.diagram.form.custom.tests/pom.xml
	tests/org.bonitasoft.studio.tests/src/org/bonitasoft/studio/tests/TestVersion.java
	tests/org.eclipse.swtbot.finder.nebula.gallery/pom.xml
	tests/org.eclipse.swtbot.finder.nebula.tableCombo/pom.xml
	tests/org.eclipse.swtbot.finder.nebula/pom.xml
	tests/pom.xml