#GH115 - freeplane node 1
#GH115 - mindmap properties provider; parsing all properties
#GH115 - mindmap properties provider; parsing all properties(3)
Merge remote-tracking branch 'origin/GH115-process-all-properties' into
GH115-process-all-properties

Conflicts:
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/MindMapPropertiesProvider1.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/xml_parser/ConvertAllAttributesProcessor.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/xml_parser/DuplicateTagProcessor.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/xml_parser/TagFullContentProcessor.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/xml_parser/TagsAsCsvListProcessor.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/xml_parser/XmlNodePropertiesParser.java
	org.flowerplatform.tests/src/org/flowerplatform/tests/freeplane/XmlParserTest.java
#115 - comments for modifications that need to be done
#115 - Merge remote-tracking branch 'origin/master' into
GH115-process-all-properties

Conflicts:
	org.flowerplatform.freeplane/META-INF/MANIFEST.MF
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/FreeplanePlugin.java
	org.flowerplatform.tests/src/org/flowerplatform/tests/EclipseIndependentTestSuite.java
#334 - partial commit
#346 - Merge remote-tracking branch 'origin/GH193-users-analysis' into
GH346-migrate-noderegistry-js-java-new

Conflicts:
	org.flowerplatform.core/src/org/flowerplatform/core/node/remote/Node.java
	org.flowerplatform.js_client.server/src/org/flowerplatform/js_client/server/ObjectMapperProvider.java
	org.flowerplatform.js_client.server/src/org/flowerplatform/js_client/server/WebServicesConfig.java
	org.flowerplatform.product/flowerplatform.product
#346 - first implementation for java client
#352 - node registry tests (expand)
#115 - Process all properties to be able to change storage layer MM ->
server -> MM - added support for unknwon tags
#115 - Process all properties to be able to change storage layer MM ->
server -> MM - finished serialization (from MM to server)
#115 - Process all properties to be able to change storage layer MM ->
server -> MM - partial deserialization
Merge remote-tracking branch 'origin/master' into
GH115-process-all-properties

Conflicts:
	org.flowerplatform.tests/src/org/flowerplatform/tests/EclipseIndependentTestSuite.java
#352 - node registry tests (expand)
#352 - temporary
#352 - Merge remote-tracking branch 'origin/master' into
GH352-node-registry-tests

Conflicts:
	org.flowerplatform.core/src/org/flowerplatform/core/CoreService.java
	org.flowerplatform.core/src/org/flowerplatform/core/RemoteMethodInvocationListener.java
	org.flowerplatform.flex_client.core/src/org/flowerplatform/flex_client/core/editor/resource/ResourceOperationsManager.as
	org.flowerplatform.flex_client.resources/src/org/flowerplatform/flex_client/resources/Resources.as
	org.flowerplatform.flex_client.team.git/.flexLibProperties
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/GitConstants.as
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/action/CheckoutAction.as
	org.flowerplatform.resources/public-resources/messages/org_flowerplatform_resources.properties
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitConstants.java
	org.flowerplatform.tests/META-INF/MANIFEST.MF
	org.flowerplatform.tests/src/org/flowerplatform/tests/EclipseIndependentTestSuite.java
	org.flowerplatform.util/META-INF/MANIFEST.MF
#352 - Merge branch 'GH352-node-registry-tests' into
GH352-node-registry-tests

Conflicts:
	org.flowerplatform.tests/src/org/flowerplatform/tests/EclipseIndependentTestSuite.java
#352 - Merge remote-tracking branch 'origin/GH193-users-analysis' into
GH352-node-registry-tests

Conflicts:
	org.flowerplatform.core/src/org/flowerplatform/core/CoreService.java
	org.flowerplatform.flex_client.resources/src/org/flowerplatform/flex_client/resources/Resources.as
	org.flowerplatform.flex_client.team.git/.flexLibProperties
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/GitConstants.as
	org.flowerplatform.flex_client.text/src/org/flowerplatform/flex_client/text/TextEditorFrontend.as
	org.flowerplatform.product/flowerplatform.product
	org.flowerplatform.resources/public-resources/messages/org_flowerplatform_resources.properties
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitConstants.java
#352 - add length as attribute in JsList