#43 - Variable size for composed image
#44 - Java synchronized decorator
#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