BS-976

Conflicts:
	bundles/plugins/org.bonitasoft.studio.preferences/plugin.properties
	bundles/plugins/org.bonitasoft.studio.preferences/src/org/bonitasoft/studio/preferences/dialog/BonitaPreferenceDialog.java