GH89 - Search component
GH137- ImageCompositionServlet: support icons from different plugins.
Merge remote-tracking branch 'origin/GH99-CodeSync-JS_diagram' into GH137-CodeSyncDecoratorsForDiagrams
GH137,ImageCompositionServlet: support icons from different plugins,
Processor that decorates the icon with the codesync marker
Merge remote-tracking branch 'origin/GH89-SearchComponent' into
GH137-CodeSyncDecoratorsForDiagrams

Conflicts:
	org.flowerplatform.codesync.code.java/src/org/flowerplatform/editor/model/java/JavaClassChildProcessor.java
	org.flowerplatform.codesync.code.java/src/org/flowerplatform/editor/model/java/JavaClassOperationProcessor.java
	org.flowerplatform.editor.model/.flexLibProperties
	org.flowerplatform.flexutil/.flexLibProperties
	org.flowerplatform.web/launch_configs/Flower Platform - Web.launch
GH152-Feature Changes: update sync and childrenSync
GH152-minor change
GH159 - Added model element for connections
Merge remote-tracking branch 'origin/master' into GH159-Connections
GH159 - Processor that adds edges for new relations
Merge remote-tracking branch 'origin/master' into GH159-Connections
GH159 - Selection renderer for connections
GH159 - Delete edges for deleted relations
GH159 - Add edges for new relations when the model element was already
connected
GH159 - Display missing relations action for elements already on the
diagram
GH159 - Add related elements and display missing relations (only works
for relations between classes)
GH159 - Add related elements and display missing relations for class
children
GH159 - Add edges for existing relations on drag and drop on diagram
GH165 - Toolbar component
GH165 - Merge remote-tracking branch 'origin/master'

Conflicts:
	org.flowerplatform.editor.model/.flexLibProperties
	org.flowerplatform.editor.model/flex_src/org/flowerplatform/editor/model/EditorModelPlugin.as
	org.flowerplatform.editor.model/public-resources/messages.properties