BS-904
shortcut "Create a variable" as output for a "Form" transient data is
unusable

Conflicts:
	bundles/plugins/org.bonitasoft.studio.data/src/org/bonitasoft/studio/data/ui/wizard/ProposalListener.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/autocompletion/AutoCompletionField.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/autocompletion/BonitaContentProposalAdapter.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/viewer/ReadOnlyExpressionViewer.java
	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/widget/ContentAssistText.java
Merge branch 'master' of https://github.com/bonitasoft/bonita-studio.git
correction of wrong conflict merge