BS-12328_form_mapping

Conflicts:
	bundles/features/studio-feature/feature.xml
	bundles/plugins/org.bonitasoft.studio.application/plugin.xml
	bundles/plugins/org.bonitasoft.studio.common.diagram/META-INF/MANIFEST.MF
	bundles/plugins/org.bonitasoft.studio.common.repository/src-test/java/org/bonitasoft/studio/common/repository/operation/ImportFolderComparatorTest.java
	bundles/plugins/org.bonitasoft.studio.common.repository/src/org/bonitasoft/studio/common/repository/operation/IResourceImporter.java
	bundles/plugins/org.bonitasoft.studio.common.repository/src/org/bonitasoft/studio/common/repository/operation/ImportFolderComparator.java
	bundles/plugins/org.bonitasoft.studio.diagram.custom/META-INF/MANIFEST.MF
	bundles/plugins/org.bonitasoft.studio.exporter/META-INF/MANIFEST.MF
	bundles/plugins/org.bonitasoft.studio.form.preview/META-INF/MANIFEST.MF
	bundles/plugins/org.bonitasoft.studio.importer/META-INF/MANIFEST.MF
	bundles/plugins/org.bonitasoft.studio.simulation.libs/META-INF/MANIFEST.MF
	bundles/plugins/org.bonitasoft.studio.validation/META-INF/MANIFEST.MF
	bundles/plugins/org.bonitasoft.studio.validation/src/org/bonitasoft/studio/validation/BatchValidationHandler.java
	bundles/plugins/org.bonitasoft.studio.validation/src/org/bonitasoft/studio/validation/operation/BatchValidationOperation.java
	bundles/plugins/org.bonitasoft.studio.validation/src/org/bonitasoft/studio/validation/operation/OffscreenDiagramEditPartRunnable.java
	platform/pom.xml
	pom.xml
	tests/org.bonitasoft.studio.test.swtbot.suite2/src/org/bonitasoft/studio/test/swtbot/suite2/AllSWTBotTests2.java
	tests/org.bonitasoft.studio.tests/META-INF/MANIFEST.MF