Added a preRun method for the MonitoredEMFStoreAction to encapsulate
calls to the native file dialog
Merged new Branching mechanism to master. not completely stable yet.

commit 511f77b135c98bc52bdbe8fa7f9a31207af46749
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri Jul 6 15:23:53 2012 +0200

    fixed some tests

commit 9cf153f685a79359c80143baba1e4a4f22ceb170
Merge: 4ddf958 6c9b994
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri Jul 6 14:56:59 2012 +0200

    Merge branch 'master' into mergeTests

    Conflicts:
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/WorkspaceTest.java
    	org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/client/ui/controller/UICheckoutController.java
    	org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/client/ui/controller/UIUpdateProjectController.java
    	org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/client/ui/dialogs/merge/MergeProjectHandler.java
    	org.eclipse.emf.emfstore.client.ui/src/org/eclipse/wb/swt/ResourceManager.java
    	org.eclipse.emf.emfstore.client.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
    	org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/client/model/connectionmanager/xmlrpc/XmlRpcConnectionManager.java
    	org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/client/model/impl/ProjectSpaceBase.java
    	org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/client/model/impl/WorkspaceImpl.java
    	org.eclipse.emf.emfstore.common/src/org/eclipse/emf/emfstore/common/EMFStoreResource.java
    	org.eclipse.emf.emfstore.common/src/org/eclipse/emf/emfstore/common/observer/PrioritizedIObserver.java
    	org.eclipse.emf.emfstore.server.model.edit/plugin.properties
    	org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/server/model/versioning/operations/provider/CompositeOperationItemProvider.java
    	org.eclipse.emf.emfstore.server.model/model/server.ecore
    	org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/connection/xmlrpc/XmlRpcEmfStoreImpl.java
    	org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/core/EmfStoreImpl.java
    	org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/core/subinterfaces/ProjectSubInterfaceImpl.java

commit 4ddf95867939905d46d406cb44c3e58f05427fbd
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jul 5 22:13:01 2012 +0200

    added extensionpoint for conflict option widget

commit a5b201fb12d414d3be876570d7ac2820609a48c3
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jul 5 21:21:27 2012 +0200

    added branching tests

commit feef9da8f6049768f4bbfeb6a31de1d8d83e68f4
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Wed Jun 27 19:54:39 2012 +0200

    made merge description configurable for branch merge cases

commit 0f4281fdae887e5c06e4b3edad1606cf3ddbb40f
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Wed Jun 27 11:45:43 2012 +0200

    added ability to register custom conflict handler for decision manager
    (merging)

commit 3afb61a4167f8a87f85a1eec9ab885e872b0ea16
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Wed Jun 27 10:58:27 2012 +0200

    allow to register conflict detection strategy for decision manager
    (merging)

commit 725cf8f22a57aa481d487bb71e9d9efe48498dc5
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Tue Jun 26 19:20:09 2012 +0200

    added branch path shortcut

commit 04509d8e7a1e547f6ea946cb11079ffd91340f04
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Tue Jun 26 16:04:24 2012 +0200

    default: use last usersession

commit 4373920588146c8cba9f74b0c9f76c89d478a179
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Tue Jun 26 15:07:37 2012 +0200

    batch of smaller changes

commit 7c8c0b1c2236371fbb61dad5f1a884f6fb5e751c
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Tue Jun 26 12:13:36 2012 +0200

    added ability to query for all versions

commit e6393ee0efcfa305820d7984f8f6ef8bc9bd544e
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Mon Jun 25 19:33:48 2012 +0200

    fixed unset unset bug

commit f04fc59e3dcdd742581adcd46bdcce8a83e69925
Merge: 5dbda69 6bdd1e7
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jun 21 18:47:06 2012 +0200

    Merge branch 'refs/heads/master' into mergeTests

    Conflicts:
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/WorkspaceTest.java
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/conflictDetection/merging/CompositeMergeTest.java
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/conflictDetection/merging/MergeTest.java
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/conflictDetection/merging/MultiAttributeMergeTest.java
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/conflictDetection/merging/MultiReferenceContainmentMergeTest.java
    	org.eclipse.emf.emfstore.client.ui/EMFStore Client with
    ExampleModel.launch
    	org.eclipse.emf.emfstore.client.ui/plugin.xml
    	org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/client/ui/controller/UICheckoutController.java
    	org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/client/ui/controller/UIProjectController.java
    	org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/client/ui/controller/UIShareProjectController.java
    	org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/client/ui/controller/UIUpdateProjectController.java
    	org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/client/model/controller/CommitController.java
    	org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/client/model/controller/ForceRevertController.java
    	org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/client/model/impl/WorkspaceImpl.java
    	org.eclipse.emf.emfstore.server/EMFStore Server with
    ExampleModel.launch

commit 6bdd1e74eb2844d66c32906c1e934c98d21a97c5
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jun 21 15:42:56 2012 +0200

    reactived historycache

commit eea9725780d1bf49a32ca43dfa95c37d3617b6a8
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jun 21 15:35:05 2012 +0200

    quickfix for historyinfo creation

commit c1aeda0be4d55e57a0b1f2b37a701ede24179d29
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jun 21 15:04:26 2012 +0200

    added features to history info

commit 154087a458a19066ff744a4ca2299bba6dd88cd2
Merge: 026302e fabc71b
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jun 21 14:16:58 2012 +0200

    Merge branch 'master' into mergeTests

    Conflicts:
    	org.eclipse.emf.emfstore.common/src/org/eclipse/emf/emfstore/common/CommonUtil.java

commit 026302e9b54835a065e82f390aa1516f6f10b3e6
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Sun Jun 17 13:11:08 2012 +0200

    working on tests

commit 0163fc03976b55465497e9af168aef7034b8632f
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri Jun 15 11:50:44 2012 +0200

    working on branching

commit cbab7f02f784df4c750c85640e17d095d0696066
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri Jun 15 10:25:10 2012 +0200

    working on branching

commit cd0287ec40e0f70c05302058a28ec1a6b4a9f10c
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jun 14 18:11:01 2012 +0200

    added field to projectSpace

commit 5bc8c22220190f5e4e4c2b16be0fc865180ad0d2
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jun 14 15:38:20 2012 +0200

    working on branching

commit 21ce486494a4d0ca701f2730660a8f72f7e81a50
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jun 14 12:07:17 2012 +0200

    fixed some merge cases

commit 3c667645b911feb21cd8991a2fff5438165ab1ac
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Wed Jun 13 18:02:15 2012 +0200

    working on branching

commit efcd56a9ac6d5f7c2421b7215fa09a6c46d8da18
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Wed Jun 13 18:02:01 2012 +0200

    fixing tests and other related bugs

commit 06054c2246a6ab29f15c3c3d5852fda7fd5ea6aa
Merge: 15b98b9 47df3cf
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri Jun 8 14:06:12 2012 +0200

    Merge branch 'master' into mergeTests

    Conflicts:
    	org.eclipse.emf.emfstore.client.test/model/testmodel.ecore
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/WorkspaceTest.java
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/conflictDetection/merging/SingleReferenceMergeTest.java
    	org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/client/ui/dialogs/merge/MergeProjectHandler.java
    	org.eclipse.emf.emfstore.client.ui/src/org/eclipse/wb/swt/ResourceManager.java
    	org.eclipse.emf.emfstore.client.ui/src/org/eclipse/wb/swt/SWTResourceManager.java

commit 47df3cfa66154cb86af988631279802cf8749f23
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jun 7 20:57:27 2012 +0200

    seperated decisionmanager logic and UI

commit bdff31ac8a150720b11f711bd3d9e35c129ac5d0
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jun 7 20:45:52 2012 +0200

    added prioritized observer

commit 478d016d56d0345ab6b474b91caccd8ef79be927
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jun 7 16:46:55 2012 +0200

    added branch selection/creation dialog

commit 99d62fcb81d8acfa15d580dbf6f754df296b0426
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Jun 7 13:51:29 2012 +0200

    yay, merging works

commit ae0c5fb81fa91b02a5c483e01ba164ad03726c2d
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Mon Jun 4 19:14:42 2012 +0200

    work in progress

commit 09279114c58913dc5378a28845c5d5fd72b55ac1
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri Jun 1 15:35:02 2012 +0200

    work in progress

commit fb13ff0dcc32082c916069c0cafb4c33e5ceec9b
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri Jun 1 12:05:40 2012 +0200

    work in progress

commit 616e4fd038451df0f9acee69e827ab2d02899ca6
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri Jun 1 09:57:19 2012 +0200

    preparing server tests

commit ed0e5b41be07e2927cc198bb2db9049e7b28a001
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu May 31 16:40:46 2012 +0200

    refactored merge/update implementation

commit 741ff402991064158b3cacb3c3ec39d734b96a90
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu May 31 14:37:30 2012 +0200

    work in progress

commit 44862dd833a637435c964ba9af91c27b45b96136
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri May 25 16:11:18 2012 +0200

    work in progress

commit 2b13bc3cde87594551ff12f3aa34086cf6a164d2
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri May 25 10:14:55 2012 +0200

    added AncestorVersionSpec

commit e01f9e79ceb98f739ab37ddfd10ee33925f2c168
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Mon May 21 18:08:25 2012 +0200

    working on branching

commit fca7994acef143cbc25e19512066129bd979cd70
Merge: 498e37f 2e9ca6d
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Mon May 21 12:30:22 2012 +0200

    Merge branch 'master' into mergeTests

    Conflicts:
    	org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/client/ui/views/historybrowserview/HistoryBrowserView.java
    	org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/client/model/controller/CommitController.java

commit 498e37febfab6bf85df7fc161724032de22f7197
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Mon May 21 12:22:54 2012 +0200

    working on branching

commit 77622d65823dcf060608eaeb1c2e36cb5077d495
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri May 18 17:27:08 2012 +0200

    working on branching

commit ec68a76cf077f85a3e344e84aa98546be9198743
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri May 11 20:44:06 2012 +0200

    added ancestor and branchedVersions features to version

commit 9439e91d01b6241fad076b14c30bd60978fc5009
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri May 11 20:26:45 2012 +0200

    pulled create branch api through all layers

commit 49b66fd4998ef966b4dff44f79aa54302664d33f
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri May 11 13:31:10 2012 +0200

    added branchversion spec and created new createVersion method im
    emfstore interface

commit 9a004ad6c9ac9926d9cacc3e212eef245a980235
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri May 11 11:12:16 2012 +0200

    added commit to branch context menu entry

commit fa94d39f68ada9eea0a28ef170ce042a14f21841
Merge: b5e0801 930b2ae
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu May 10 15:49:34 2012 +0200

    Merge branch 'mergeTests' of ssh://git.eclipse.org/gitroot/emf-store/org.eclipse.emf.emfstore.core into mergeTests

    Conflicts:
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/conflictDetection/merging/CompositeMergeTest.java
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/conflictDetection/merging/DeleteMergeTest.java
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/conflictDetection/merging/MultiReferenceContainmentMergeTest.java

commit b5e08012cf17a7d1b6e2cfa9f2fb30eb1e5b9817
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu May 10 15:40:19 2012 +0200

    working on tests

commit 930b2ae2cfd8cc24f70f35fd604ac15e8db1c0c5
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Mon May 7 20:52:40 2012 +0200

    working on tests

commit c4f42e20dafc5f99ed4d287faed0a3a5782d219c
Merge: 62b919f 497d07e
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Fri May 4 11:33:38 2012 +0200

    Merge branch 'master' into mergeTests

    Conflicts:
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/testmodel/TestElement.java
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/testmodel/impl/TestElementImpl.java
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/testmodel/impl/TestmodelPackageImpl.java
    	org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/client/test/testmodel/util/TestmodelSwitch.java

commit 497d07e360e4a284173f89edf83a5b8530c2a4c1
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Thu Apr 26 19:49:50 2012 +0200

    working on tests.

commit 385ce1944e18b1ebce29eca44acece608f50322f
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Wed Apr 25 17:56:14 2012 +0200

    working on merging tests

commit d03d90b839781f8474e8e7e4efdbe6bfe37505c9
Author: Otto von Wesendonk <wesendon@in.tum.de>
Date:   Wed Apr 25 13:48:01 2012 +0200

    working on tests
fixed some tests
using clone instead of ecourutil.copy in Versions
call file#close in zip
replaced EcoureUtil.copy with ModelUtil.clone in several places
fixed model mutator tests
Merge branch 'master' of ssh://git.eclipse.org/gitroot/emf-store/org.eclipse.emf.emfstore.core
javadoc
fixed warning
added force delete dir method to our file util and introduced instead of
file
util
of
apache io
fixed header
modified conflict descriptions
fixed header
fixed warning
added serveral javadoc comments
Merge branch 'master' of ssh://ovonwesend@git.eclipse.org/gitroot/emf-store/org.eclipse.emf.emfstore.core.git

Conflicts:
	org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/client/model/changeTracking/merging/ConflictResolver.java
dummy commit in order to trigger build, as wished by koegel
Merge branch 'master' into orig_master
Bring new browser view into branch orig_master