Merge remote-tracking branch 'origin/master' into GH45-add-child-descriptor
#45 - AddChildDescriptor logic + descriptors for java
#45 - Modifiers drop down list property renderer
#45 - Merge remote-tracking branch 'origin/GH43-image-composer-servlet'
into GH45-add-child-descriptor

Conflicts:
	org.flowerplatform.util/src/org/flowerplatform/util/servlet/ImageComposerServlet.java
#45 - Merge remote-tracking branch 'origin/GH44-icons-controllers' into
GH45-add-child-descriptor

Conflicts:
	org.flowerplatform.codesync.code.java/src/org/flowerplatform/codesync/code/java/JavaImageConstants.java
	org.flowerplatform.codesync.code.java/src/org/flowerplatform/codesync/code/java/controller/JavaIconPropertyProvider.java
#45 - Merge branch 'GH45-add-child-descriptor' of
https://github.com/flower-platform/flower-platform-4.git

Conflicts:
	org.flowerplatform.codesync.code.java/src/org/flowerplatform/codesync/code/java/adapter/JavaAbstractAstNodeModelAdapter.java
	org.flowerplatform.codesync.code.java/src/org/flowerplatform/codesync/code/java/controller/JavaIconPropertyProvider.java
	org.flowerplatform.codesync/src/org/flowerplatform/codesync/adapter/AbstractModelAdapter.java
	org.flowerplatform.codesync/src/org/flowerplatform/codesync/adapter/NodeModelAdapter.java
	org.flowerplatform.codesync/src/org/flowerplatform/codesync/controller/CodeSyncAddNodeController.java
	org.flowerplatform.core/src/org/flowerplatform/core/node/remote/NodeService.java
	org.flowerplatform.flex_client.codesync/src/org/flowerplatform/flex_client/codesync/CodeSyncPlugin.as
	org.flowerplatform.flex_client.core/.flexLibProperties
	org.flowerplatform.flex_client.core/src/org/flowerplatform/flex_client/core/CorePlugin.as
	org.flowerplatform.flex_client.core/src/org/flowerplatform/flex_client/core/mindmap/action/AddNodeAction.as
	org.flowerplatform.util/src/org/flowerplatform/util/controller/TypeDescriptorRegistry.java
Merge branch 'master' of https://github.com/flower-platform/flower-platform-4.git