GH167 - commit before merge
GH167 - Merge remote-tracking branch
'origin/GH21-GeneralPropertiesEditor' into
GH166-ContextForActions&InvokeCMProgr

Conflicts:
	org.flowerplatform.editor.model/.flexLibProperties
	org.flowerplatform.editor.model/flex_src/org/flowerplatform/editor/model/DiagramEditorFrontend.as
	org.flowerplatform.editor.model/flex_src/org/flowerplatform/editor/model/EditorModelPlugin.as
	org.flowerplatform.editor.model/flex_src/org/flowerplatform/editor/model/renderer/BoxRenderer.mxml
GH167 - location for new elements dialog implemented
GH167 - Merge remote-tracking branch 'origin/master' into
GH167-LocNewElemDialog

Conflicts:
	org.flowerplatform.codesync.code.java/src/com/crispico/flower/mp/codesync/code/java/CodeSyncCodeJavaPlugin.java
	org.flowerplatform.editor.model/.flexLibProperties
	org.flowerplatform.editor.model/flex_src/org/flowerplatform/editor/model/DiagramEditorFrontend.as
	org.flowerplatform.editor.model/flex_src/org/flowerplatform/editor/model/EditorModelPlugin.as
	org.flowerplatform.editor.model/flex_src/org/flowerplatform/editor/model/renderer/BoxRenderer.mxml
GH167 - Merge remote-tracking branch
'origin/GH221-codesync-descriptors-operations' into
GH167-LocNewElemDialog

Conflicts:
	org.flowerplatform.codesync.code.java/src/com/crispico/flower/mp/codesync/code/java/CodeSyncCodeJavaPlugin.java
	org.flowerplatform.codesync.code.javascript/flex_src/org/flowerplatform/codesync/code/javascript/CodeSyncCodeJavascriptPlugin.as
	org.flowerplatform.codesync.code.javascript/public-resources/messages.properties
	org.flowerplatform.codesync/META-INF/MANIFEST.MF
	org.flowerplatform.editor.model/flex_src/org/flowerplatform/editor/model/EditorModelPlugin.as
GH167 - move classes to codesync project
Merge remote-tracking branch 'origin/GH21-GeneralPropertiesEditor' into GH167-LocNewElemDialog
GH167 - add diagram properties provider logic
GH167 - modify actions visibility after adding diagram as selectable
item
GH167 - Merge branch 'GH167-LocNewElemDialog' of
https://github.com/flower-platform/main.git

Conflicts:
	org.flowerplatform.codesync.code.java/src/com/crispico/flower/mp/codesync/code/java/CodeSyncCodeJavaPlugin.java
	org.flowerplatform.codesync/src/org/flowerplatform/codesync/properties/CodeSyncPropertiesProvider.java
	org.flowerplatform.editor.model/flex_src/org/flowerplatform/editor/model/EditorModelPlugin.as
	org.flowerplatform.editor.model/public-resources/messages.properties