GH163- Eclipse Create New Diagram action (just started)
GH122-[Eclipse] Finish Open Close Logic
GH163-Create New Diagram Action (eclipse)
GH168-Action that add elements on diagram (just started)
Merge branch 'GH168-ActionThatAddElementsOnDiagram' into
GH168-action-that-add-elements-on-diagram

Conflicts:
	org.flowerplatform.eclipse/plugin.xml
GH168 - Action that add elements on diagram (part1)
Merge branch 'master' into GH168-action-that-add-elements-on-diagram
Merge branch 'GH163-Eclipse_Create_New_Diagram_action' into
GH168-action-that-add-elements-on-diagram

Conflicts:
	org.flowerplatform.codesync.code.java/META-INF/MANIFEST.MF
	org.flowerplatform.eclipse/launch_configs/Flower Platform -
Eclipse.launch
	org.flowerplatform.eclipse/src/org/flowerplatform/eclipse/EclipseFileAccessController.java
	org.flowerplatform.eclipse/src/org/flowerplatform/eclipse/part/FlowerDiagramEditor.java
	org.flowerplatform.editor.model/src/org/flowerplatform/editor/model/remote/NewDiagramAction.java
	org.flowerplatform.editor/src/org/flowerplatform/editor/file/IFileAccessController.java
	org.flowerplatform.web/src/org/flowerplatform/web/WebFileAccessController.java
GH168 - Action that add elements on diagram
Merge branch 'GH122-Finish_Open_Close_Logic' into
GH126-dirty-and-saveables-eclipse

Conflicts:
	org.flowerplatform.common/flex_src/org/flowerplatform/common/CommonPlugin.as
	org.flowerplatform.communication/src/org/flowerplatform/communication/CommunicationPlugin.java
	org.flowerplatform.eclipse/build.properties
	org.flowerplatform.eclipse/flex_src/org/flowerplatform/eclipse/EclipsePlugin.as
	org.flowerplatform.eclipse/launch_configs/Flower Platform -
Eclipse.launch
	org.flowerplatform.eclipse/plugin.xml
	org.flowerplatform.eclipse/src/org/flowerplatform/eclipse/part/FlowerDiagramEditor.java
	org.flowerplatform.editor/flex_src/org/flowerplatform/editor/remote/EditorStatefulClient.as
	org.flowerplatform.editor/src/org/flowerplatform/editor/remote/FileBasedEditorStatefulService.java
	org.flowerplatform.flex_host_app/WebContent/commons.js
	org.flowerplatform.flex_host_app/launch_configs/Flower Platform - Flex
Debug.launch
	org.flowerplatform.web.app/launch_configs/Flower Platform - Web (write
plugin config to file).launch
GH126 - [Eclipse] Dirty and save action
GH126 - [Eclipse] Dirty and save action
Merge remote-tracking branch 'origin/master' into
GH183-codesync-indep-of-ifile

Conflicts:
	org.flowerplatform.codesync.code/src/com/crispico/flower/mp/codesync/code/adapter/AbstractFileModelAdapter.java
GH183 - Refactor after code review
GH183 - Sync independent of File/IFile
GH183 - Refactor for tests
Merge pull request #324 from flower-platform/GH183-codesync-indep-of-ifile

Gh183 codesync indep of ifile
Merge branch 'master' into GH310-integration-with-idea

Conflicts:
	org.flowerplatform.eclipse/launch_configs/Flower Platform -
Eclipse.launch
GH310-integration-with-idea(new diagram action)
GH310-integration-with-idea(backup)