some refactoring
Merge remote-tracking branch 'origin/workspace_1.0' into workspace_1.0

Conflicts:
	freeplane_plugin_workspace/META-INF/MANIFEST.MF
	freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/mindmapmode/MModeWorkspaceController.java