#236 - intermediate commit
Merge remote-tracking branch 'origin/master' into GH236-notes

Conflicts:
	org.flowerplatform.flex_client.mindmap/src/org/flowerplatform/flex_client/mindmap/MindMapPlugin.as
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/MindMapPropertiesProvider.java
#236 - note
Merge branch 'GH236-notes'

Conflicts:
	org.flowerplatform.flex_client.mindmap/.flexLibProperties
	org.flowerplatform.flex_client.mindmap/src/org/flowerplatform/flex_client/mindmap/MindMapPlugin.as