GH58 - Reintroduce CodeSync unit tests (initial)
GH58 - Cleanup for add to modifiers list logic
Merge remote-tracking branch 'origin/master' into
GH58-reintroduce-codesync-tests

Conflicts:
	org.flowerplatform.codesync.code.java/src/org/flowerplatform/codesync/code/java/adapter/JavaAbstractAstNodeModelAdapter.java
#70 - just started
GH58 - Run CodeSync tests independent of eclipse
#41 - Changes after review #67
#41 - Set childrenSync flag after removing a child after sync
#44 - Changes after review #69
#63 - map for temporary files added and concurrency problem solved
#70 - before checkout
#45 - Changes after review #73
#63 - property added to skip the use of temporary folder
#76 - RootNodeInfoDAO session management (initial)
#70 - intermediate commit
Merge remote-tracking branch 'origin/master' into
GH76-root-node-info-resource-management

Conflicts:
	org.flowerplatform.core/src/org/flowerplatform/core/CorePlugin.java
	org.flowerplatform.core/src/org/flowerplatform/core/node/remote/Node.java
	org.flowerplatform.core/src/org/flowerplatform/core/node/remote/NodeService.java
	org.flowerplatform.core/src/org/flowerplatform/core/node/update/InMemoryUpdateDAO.java
	org.flowerplatform.core/src/org/flowerplatform/core/node/update/remote/UpdateService.java
	org.flowerplatform.flex_client.core/src/org/flowerplatform/flex_client/core/mindmap/update/NodeUpdateProcessor.as
Merge remote-tracking branch 'origin/master' into
GH70-improvement-using-a-layout-instead-of-the-data-group

Conflicts:
	org.flowerplatform.codesync/src/org/flowerplatform/codesync/CodeSyncPlugin.java
	org.flowerplatform.flex_client.properties/.flexLibProperties
	org.flowerplatform.flex_client.properties/src/org/flowerplatform/flex_client/properties/PropertiesView.mxml
	org.flowerplatform.flex_client.properties/src/org/flowerplatform/flex_client/properties/PropertyItemRenderer.mxml
	org.flowerplatform.flex_client.properties/src/org/flowerplatform/flex_client/properties/property_renderer/BasicPropertyRenderer.as
	org.flowerplatform.flex_client.properties/src/org/flowerplatform/flex_client/properties/property_renderer/DropDownListPropertyRenderer.as
#61 - MindMap icons (aren't displayed in renderer)
#76 - Root node for mindmap nodes is the resource node that was
subscribed
#60 - code review modifications
#61 - Merge remote-tracking branch 'origin/GH60-node-limits-review' into
GH61-icons

Conflicts:
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/MindMapBasicPropertiesProvider.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/MindMapBasicPropertySetter.java