Conflicts:
	bundles/plugins/org.bonitasoft.studio.condition.ui/src/org/bonitasoft/studio/condition/ui/expression/ComparisonExpressionEditor.java
	bundles/plugins/org.bonitasoft.studio.diagram.form.properties/src/org/bonitasoft/studio/properties/form/sections/actions/contributions/FileGridPropertySectionContribution.java
	bundles/plugins/org.bonitasoft.studio.exporter/src-test/java/org/bonitasoft/studio/exporter/form/FormsExporterTest.java
	bundles/plugins/org.bonitasoft.studio.tests-utils/src/org/bonitasoft/studio/model/process/builders/ActivityBuilder.java
	bundles/plugins/org.bonitasoft.studio.tests-utils/src/org/bonitasoft/studio/model/process/builders/BusinessObjectDataBuilder.java
	bundles/plugins/org.bonitasoft.studio.tests-utils/src/org/bonitasoft/studio/model/process/builders/DataBuilder.java
	bundles/plugins/org.bonitasoft.studio.tests-utils/src/org/bonitasoft/studio/model/process/builders/JavaObjectDataBuilder.java
	bundles/plugins/org.bonitasoft.studio.tests-utils/src/org/bonitasoft/studio/model/process/builders/TaskBuilder.java
	bundles/plugins/org.bonitasoft.studio.tests-utils/src/org/bonitasoft/studio/model/process/builders/XMLDataBuilder.java
	tests/org.bonitasoft.studio.util.tests/src/org/bonitasoft/studio/util/test/conditions/ShellIsActiveWithThreadSTacksOnFailure.java