#41 - Sync/childrenSync flags (initial)
#41 - Merge remote-tracking branch 'origin/master' into
GH41-codesync-flags-and-propagation

Conflicts:
	org.flowerplatform.flex_client.codesync/src/org/flowerplatform/flex_client/codesync/CodeSyncPlugin.as
#41 - Conflict/childrenConflict flags
#43 - ImageComposerServlet
#43 - Variable size for composed image
#43 Merge branch 'GH43-image-composer-servlet' of
https://github.com/flower-platform/flower-platform-4.git

Conflicts:
	org.flowerplatform.codesync/src/org/flowerplatform/codesync/adapter/NodeModelAdapter.java
	org.flowerplatform.codesync/src/org/flowerplatform/codesync/adapter/NodeModelAdapterAncestor.java
	org.flowerplatform.codesync/src/org/flowerplatform/codesync/adapter/NodeModelAdapterLeft.java
	org.flowerplatform.codesync/src/org/flowerplatform/codesync/controller/CodeSyncPropertySetter.java
	org.flowerplatform.core/src/org/flowerplatform/core/node/controller/update/UpdaterAddNodeController.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.freeplane/src/org/flowerplatform/freeplane/FreeplanePlugin.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/FreeplaneUtils.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/FreeplaneChildrenProvider.java