#242 - Merge branch 'master' into GH242-preferences-editor
#242 - preferences editor - partial commit

Conflicts:
	org.flowerplatform.core/src/org/flowerplatform/core/CorePlugin.java
	org.flowerplatform.flex_client.properties/src/org/flowerplatform/flex_client/properties/CreateNodeView.mxml
	org.flowerplatform.flex_client.properties/src/org/flowerplatform/flex_client/properties/PropertiesView.mxml
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/FreeplanePlugin.java
#242 - remove IActionProvider from IViewContent

Conflicts:
	org.flowerplatform.flex_client.core/src/org/flowerplatform/flex_client/core/node_tree/NodeTree.mxml
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/FreeplanePlugin.java
#242 - keep same listener when dock/undock properties view

Conflicts:
	org.flowerplatform.flex_client.core/src/org/flowerplatform/flex_client/core/editor/EditorFrontend.as
#242 - remove IActionProvider from IViewContent

Conflicts:
	org.flowerplatform.flex_client.core/src/org/flowerplatform/flex_client/core/node_tree/NodeTree.mxml
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/FreeplanePlugin.java
#242 - keep same listener when dock/undock properties view

Conflicts:
	org.flowerplatform.flex_client.core/src/org/flowerplatform/flex_client/core/editor/EditorFrontend.as
#242 - partial commit - preferences view

Conflicts:
	org.flowerplatform.core/src/org/flowerplatform/core/CorePlugin.java
	org.flowerplatform.flex_client.core/.flexLibProperties
	org.flowerplatform.flex_client.core/src/org/flowerplatform/flex_client/core/CorePlugin.as
#242 - Preferences Editor (ui implemenetation)
#329 - Add text editor and "open with" action
Merge pull request #335 from flower-platform/GH242-preferences-editor

#242 preferences editor
Merge pull request #336 from flower-platform/GH329-add-text-editor-open-with

#329 add text editor & open with menu
Merge remote-tracking branch 'origin/master' into
GH278-undo-redo-command-stack

Conflicts:
	org.flowerplatform.core/META-INF/MANIFEST.MF
	org.flowerplatform.core/src/org/flowerplatform/core/CoreConstants.java
	org.flowerplatform.core/src/org/flowerplatform/core/node/NodeService.java
	org.flowerplatform.core/src/org/flowerplatform/core/node/remote/NodeServiceRemote.java
	org.flowerplatform.flex_client.core/src/org/flowerplatform/flex_client/core/CorePlugin.as
	org.flowerplatform.flex_client.host_app.config.web/WebContent/flexHostAppConfig.js
	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/StringWithButtonPropertyRenderer.as
	org.flowerplatform.resources/readme.md
Added UI action for command stack; command stack bug fixes