Merge branch 'recovered-2'

Conflicts:
	releng/org.eclipse.amp.build-feature/buckminster.cspex
	releng/org.eclipse.amp.build-feature/feature.xml
	releng/org.eclipse.amp.releng/promoter.ant
	releng/org.eclipse.amp.releng/publisher.properties
diff --git a/org.eclipse.amp.agf/features/org.eclipse.amp.agf-feature/feature.xml b/org.eclipse.amp.agf/features/org.eclipse.amp.agf-feature/feature.xml
index ca1a981..0db4cf9 100644
--- a/org.eclipse.amp.agf/features/org.eclipse.amp.agf-feature/feature.xml
+++ b/org.eclipse.amp.agf/features/org.eclipse.amp.agf-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.agf"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.agf"
       image="eclipse_update_120.jpg">
diff --git a/org.eclipse.amp.agf/features/org.eclipse.amp.agf.chart-feature/feature.xml b/org.eclipse.amp.agf/features/org.eclipse.amp.agf.chart-feature/feature.xml
index 32ea0de..9b01219 100644
--- a/org.eclipse.amp.agf/features/org.eclipse.amp.agf.chart-feature/feature.xml
+++ b/org.eclipse.amp.agf/features/org.eclipse.amp.agf.chart-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.agf.chart"
       label="AMP AGF Chart (Incubation)"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.agf.chart"
       image="eclipse_update_120.jpg">
@@ -27,8 +27,8 @@
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.birt.chart.ui" version="2.3.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.birt.chart.device.swt" version="2.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.birt.chart.ui"/>
+      <import plugin="org.eclipse.birt.chart.device.swt"/>
       <import plugin="org.eclipse.amp.axf.core"/>
       <import plugin="org.eclipse.amp.axf.views"/>
       <import plugin="org.eclipse.amp.agf.core"/>
diff --git a/org.eclipse.amp.agf/features/org.eclipse.amp.agf.zest-feature/feature.xml b/org.eclipse.amp.agf/features/org.eclipse.amp.agf.zest-feature/feature.xml
index aa65b5b..5b2a4ef 100644
--- a/org.eclipse.amp.agf/features/org.eclipse.amp.agf.zest-feature/feature.xml
+++ b/org.eclipse.amp.agf/features/org.eclipse.amp.agf.zest-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.agf.zest"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.agf.zest">
 
diff --git a/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d-feature/feature.xml b/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d-feature/feature.xml
index b0c4985..becf32c 100644
--- a/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d-feature/feature.xml
+++ b/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.agf3d"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.agf3d">
 
@@ -26,24 +26,23 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.amp.axf.core" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.axf.views" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.agf.core" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.lwjgl" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.axf.core" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.axf.views" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.agf.core" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.lwjgl"/>
       <import plugin="org.eclipse.draw3d.ui" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="org.ascape.core"/>
-      <import plugin="org.ascape.ui.amp" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.escape.ascape" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.agf3d" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.gef3d" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.draw3d.geometry" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.draw3d.lwjgl" version="0.8.0" match="greaterOrEqual"/>
+      <import plugin="org.ascape.ui.amp" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.escape.ascape" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.agf3d" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.gef3d"/>
+      <import plugin="org.eclipse.draw3d.geometry"/>
+      <import plugin="org.eclipse.draw3d.lwjgl"/>
       <import plugin="org.eclipse.draw2d"/>
       <import plugin="org.eclipse.core.runtime" version="3.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.draw3d"/>
       <import plugin="org.eclipse.gef"/>
-      <import plugin="org.eclipse.draw3d.graphics3d" version="0.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.draw3d.graphics3d" version="0.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.draw3d.graphics3d"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d.feature/.project b/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d.feature/.project
deleted file mode 100644
index b90d09d..0000000
--- a/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.amp.agf3d.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d.feature/build.properties b/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d.feature/feature.xml b/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d.feature/feature.xml
deleted file mode 100644
index 89c975f..0000000
--- a/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d.feature/feature.xml
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.amp.agf3d.feature"
-      label="AMP AGF 3D (Incubation)"
-      version="0.2.0.qualifier"
-      provider-name="Eclipse Agent Modeling Platform">
-
-   <description url="http://eclipse.org/amp">
-      Agent Graphics Framework and Escape support for 3D Graphics using GEF3D. Currently supports 2D spaces only using 2 1/2 D. Requires LWJGL plugin at http://lwjgl.org/update.
-   </description>
-
-   <copyright>
-      Copyright 2009 Metascape LLC.
-   </copyright>
-
-   <license>
-      Eclipse Public License - v 1.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS
-ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE
-OF THIS AGREEMENT.
-1. DEFINITIONS
-&quot;Contribution&quot; means:
-a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate
-from and are distributed by that particular Contributor. A Contribution
-&apos;originates&apos; from a Contributor if it was added to the Program
-by such Contributor itself or anyone acting on such Contributor&apos;s
-behalf. Contributions do not include additions to the Program
-which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.
-&quot;Contributor&quot; means any person or entity that distributes the
-Program.
-&quot;Licensed Patents&quot; mean patent claims licensable by a Contributor
-which are necessarily infringed by the use or sale of its Contribution
-alone or when combined with the Program.
-&quot;Program&quot; means the Contributions distributed in accordance with
-this Agreement.
-&quot;Recipient&quot; means anyone who receives the Program under this
-Agreement, including all Contributors.
-2. GRANT OF RIGHTS
-a) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free copyright
-license to reproduce, prepare derivative works of, publicly display,
-publicly perform, distribute and sublicense the Contribution
-of such Contributor, if any, and such derivative works, in source
-code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby
-grants Recipient a non-exclusive, worldwide, royalty-free patent
-license under Licensed Patents to make, use, sell, offer to sell,
-import and otherwise transfer the Contribution of such Contributor,
-if any, in source code and object code form. This patent license
-shall apply to the combination of the Contribution and the Program
-if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to
-be covered by the Licensed Patents. The patent license shall
-not apply to any other combinations which include the Contribution.
-No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants
-the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe
-the patent or other intellectual property rights of any other
-entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement
-of intellectual property rights or otherwise. As a condition
-to exercising the rights and licenses granted hereunder, each
-Recipient hereby assumes sole responsibility to secure any other
-intellectual property rights needed, if any. For example, if
-a third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient&apos;s responsibility to acquire
-that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright
-license set forth in this Agreement.
-3. REQUIREMENTS
-A Contributor may choose to distribute the Program in object
-code form under its own license agreement, provided that:
-a) it complies with the terms and conditions of this Agreement;
-and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties
-and conditions, express and implied, including warranties or
-conditions of title and non-infringement, and implied warranties
-or conditions of merchantability and fitness for a particular
-purpose;
-ii) effectively excludes on behalf of all Contributors all liability
-for damages, including direct, indirect, special, incidental
-and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement
-are offered by that Contributor alone and not by any other party;
-and
-iv) states that source code for the Program is available from
-such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for
-software exchange.
-When the Program is made available in source code form:
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of
-the Program.
-Contributors may not remove or alter any copyright notices contained
-within the Program.
-Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.
-4. COMMERCIAL DISTRIBUTION
-Commercial distributors of software may accept certain responsibilities
-with respect to end users, business partners and the like. While
-this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-(&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify
-every other Contributor (&quot;Indemnified Contributor&quot;) against any
-losses, damages and costs (collectively &quot;Losses&quot;) arising from
-claims, lawsuits and other legal actions brought by a third party
-against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection
-with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any
-claims or Losses relating to any actual or alleged intellectual
-property infringement. In order to qualify, an Indemnified Contributor
-must: a) promptly notify the Commercial Contributor in writing
-of such claim, and b) allow the Commercial Contributor to control,
-and cooperate with the Commercial Contributor in, the defense
-and any related settlement negotiations. The Indemnified Contributor
-may participate in any such claim at its own expense.
-For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor&apos;s responsibility
-alone. Under this section, the Commercial Contributor would have
-to defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any
-other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-5. NO WARRANTY
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM
-IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with
-its exercise of rights under this Agreement , including but not
-limited to the risks and costs of program errors, compliance
-with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations.
-6. DISCLAIMER OF LIABILITY
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE
-OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGES.
-7. GENERAL
-If any provision of this Agreement is invalid or unenforceable
-under applicable law, it shall not affect the validity or enforceability
-of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be
-reformed to the minimum extent necessary to make such provision
-valid and enforceable.
-If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging
-that the Program itself (excluding combinations of the Program
-with other software or hardware) infringes such Recipient&apos;s patent(s),
-then such Recipient&apos;s rights granted under Section 2(b) shall
-terminate as of the date such litigation is filed.
-All Recipient&apos;s rights under this Agreement shall terminate if
-it fails to comply with any of the material terms or conditions
-of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If
-all Recipient&apos;s rights under this Agreement terminate, Recipient
-agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient&apos;s obligations under
-this Agreement and any licenses granted by Recipient relating
-to the Program shall continue and survive.
-Everyone is permitted to copy and distribute copies of this Agreement,
-but in order to avoid inconsistency the Agreement is copyrighted
-and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other
-than the Agreement Steward has the right to modify this Agreement.
-The Eclipse Foundation is the initial Agreement Steward. The
-Eclipse Foundation may assign the responsibility to serve as
-the Agreement Steward to a suitable separate entity. Each new
-version of the Agreement will be given a distinguishing version
-number. The Program (including Contributions) may always be distributed
-subject to the version of the Agreement under which it was received.
-In addition, after a new version of the Agreement is published,
-Contributor may elect to distribute the Program (including its
-Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights
-or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under
-this Agreement are reserved.
-This Agreement is governed by the laws of the State of New York
-and the intellectual property laws of the United States of America.
-No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose.
-Each party waives its rights to a jury trial in any resulting
-litigation.
-   </license>
-
-   <url>
-      <update label="AMP Update Site" url="http://eclipse.org/amp/updates/release"/>
-      <discovery label="LWJGL Support for GEF3D" url="http://lwjgl.org/update"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.amp.axf.core" version="0.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.axf.views" version="0.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.agf.core" version="0.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.agf.ide" version="0.2.0" match="greaterOrEqual"/>
-      <import plugin="org.lwjgl"/>
-      <import plugin="org.ascape.core" version="5.2.0" match="greaterOrEqual"/>
-      <import plugin="org.ascape.ui.amp" version="0.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.escape.ascape" version="0.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.gef3d" version="0.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.agf3d" version="0.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.draw2d"/>
-      <import plugin="org.eclipse.draw3d.geometry" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.draw3d.graphics3d" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.draw3d.graphics3d" version="0.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.gef"/>
-      <import plugin="org.eclipse.draw3d.ui" version="0.8.1" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.amp.agf3d"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.amp.escape.ascape.agf3d"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.draw3d"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.draw3d.geometry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.draw3d.graphics3d"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.draw3d.lwjgl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.draw3d.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.draw3d.x3d"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gef3d"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gef3d.ext"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.chart/META-INF/MANIFEST.MF b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.chart/META-INF/MANIFEST.MF
index db7ba16..1a8035c 100644
--- a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.chart/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.chart/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Vendor: %providerName
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.amp.agf.chart;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.agf.chart.ide.AGFChartPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.views,
diff --git a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.core/META-INF/MANIFEST.MF b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.core/META-INF/MANIFEST.MF
index cf63dd8..334b629 100644
--- a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.amp.agf.core;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.ui.views,
@@ -11,7 +11,7 @@
  org.eclipse.gef;visibility:=reexport,
  org.eclipse.amp.axf.core,
  org.eclipse.amp.axf.views,
- org.eclipse.amp.axf.ide;bundle-version="0.8.0"
+ org.eclipse.amp.axf.ide;bundle-version="0.8.1"
 Export-Package: org.eclipse.amp.agf,
  org.eclipse.amp.agf.gef,
  org.eclipse.amp.agf.tree;
diff --git a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.ide/META-INF/MANIFEST.MF b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.ide/META-INF/MANIFEST.MF
index 22f3903..3ad1ed7 100644
--- a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.ide/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Vendor: %providerName
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.amp.agf.ide;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.agf.ide.AGFIDEPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
diff --git a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.zest.ide/META-INF/MANIFEST.MF b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.zest.ide/META-INF/MANIFEST.MF
index 2ce1177..9d61fb1 100644
--- a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.zest.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.zest.ide/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.amp.agf.zest.ide;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.agf.zest.ide.AMPZestPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.amp.agf.zest,
  org.eclipse.amp.axf.ide,
  org.eclipse.amp.axf.views,
- org.eclipse.amp.agf.core;bundle-version="0.8.0"
+ org.eclipse.amp.agf.core;bundle-version="0.8.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: plugin
diff --git a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.zest/META-INF/MANIFEST.MF b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.zest/META-INF/MANIFEST.MF
index 4d866e9..2c69f0e 100644
--- a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.zest/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.zest/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.amp.agf.zest;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.amp.axf.core,
  org.eclipse.gef,
  org.eclipse.amp.axf.views,
- org.eclipse.amp.agf.core;bundle-version="0.8.0",
+ org.eclipse.amp.agf.core;bundle-version="0.8.1",
  org.eclipse.zest.core;bundle-version="1.1.0";visibility:=reexport,
  org.eclipse.zest.layouts;bundle-version="1.1.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf/META-INF/MANIFEST.MF b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf/META-INF/MANIFEST.MF
index 6daf18a..b4a37e8 100644
--- a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.agf;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.agf.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
diff --git a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf3d/META-INF/MANIFEST.MF b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf3d/META-INF/MANIFEST.MF
index 96b527c..aec098e 100644
--- a/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf3d/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf3d/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.agf3d;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.agf3d.AGF3DPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.amp.axf.core;bundle-version="0.8.0",
- org.eclipse.amp.axf.views;bundle-version="0.8.0",
- org.eclipse.amp.agf.core;bundle-version="0.8.0",
+ org.eclipse.amp.axf.core;bundle-version="0.8.1",
+ org.eclipse.amp.axf.views;bundle-version="0.8.1",
+ org.eclipse.amp.agf.core;bundle-version="0.8.1",
  org.eclipse.draw3d,
  org.eclipse.draw3d.lwjgl,
  org.eclipse.gef3d,
diff --git a/org.eclipse.amp.amf/features/org.eclipse.amp.amf-feature/feature.xml b/org.eclipse.amp.amf/features/org.eclipse.amp.amf-feature/feature.xml
index 79456d6..a0f78ef 100644
--- a/org.eclipse.amp.amf/features/org.eclipse.amp.amf-feature/feature.xml
+++ b/org.eclipse.amp.amf/features/org.eclipse.amp.amf-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.amf"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.amf.acore.edit">
 
@@ -34,9 +34,9 @@
       <import plugin="org.eclipse.emf.ecore.editor"/>
       <import plugin="org.eclipse.jdt.launching" version="3.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.amp.amf.gen" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.ide" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.gen.ide" version="0.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.gen" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.ide" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.gen.ide" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.jdt.ui"/>
       <import plugin="org.eclipse.core.resources"/>
diff --git a/org.eclipse.amp.amf/features/org.eclipse.amp.amf.core-feature/feature.xml b/org.eclipse.amp.amf/features/org.eclipse.amp.amf.core-feature/feature.xml
index 6c6d2d9..55c605c 100644
--- a/org.eclipse.amp.amf/features/org.eclipse.amp.amf.core-feature/feature.xml
+++ b/org.eclipse.amp.amf/features/org.eclipse.amp.amf.core-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.amf.core"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.amf.acore">
 
diff --git a/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.ascape-feature/feature.xml b/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.ascape-feature/feature.xml
index 826a9fc..f4a7f6f 100644
--- a/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.ascape-feature/feature.xml
+++ b/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.ascape-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.amf.target.ascape"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.amf.ide.ascape">
 
@@ -33,8 +33,8 @@
       <import plugin="org.eclipse.jdt.debug.ui"/>
       <import plugin="org.ascape.core"/>
       <import plugin="org.eclipse.jdt.core" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.ide" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.gen.ide" version="0.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.ide" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.gen.ide" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>
    </requires>
 
diff --git a/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.escape-feature/feature.xml b/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.escape-feature/feature.xml
index b4d23d8..e6502c8 100644
--- a/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.escape-feature/feature.xml
+++ b/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.escape-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.amf.target.escape"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.escape.amf.ide">
 
@@ -32,18 +32,18 @@
       <import plugin="org.eclipse.jdt.core" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>
       <import plugin="org.ascape.core"/>
-      <import plugin="org.eclipse.amp.amf.acore.edit" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.acore.editor" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.gen.ide" version="0.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.acore.edit" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.acore.editor" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.gen.ide" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.amp.escape.ide"/>
-      <import plugin="org.eclipse.xtext" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.parameters" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.abase" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.axf.core" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.testing" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.escape.ide" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.escape.ascape" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.axf.ide" version="0.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.parameters" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.abase" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.axf.core" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.testing" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.escape.ide" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.escape.ascape" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.axf.ide" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.lang"/>
    </requires>
diff --git a/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.escape.feature/feature.xml b/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.escape.feature/feature.xml
index 0056192..d8d9bfa 100644
--- a/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.escape.feature/feature.xml
+++ b/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.escape.feature/feature.xml
@@ -82,7 +82,7 @@
       <import plugin="org.eclipse.amp.amf.gen.escape" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.amp.amf.gen.ide" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.amp.escape.ide"/>
-      <import plugin="org.eclipse.xtext" version="0.7.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext" match="greaterOrEqual"/>
       <import plugin="org.eclipse.amp.amf.parameters" version="0.2.0" match="greaterOrEqual"/>
    </requires>
 
diff --git a/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.repast-feature/feature.xml b/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.repast-feature/feature.xml
index 143f22a..c20288f 100644
--- a/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.repast-feature/feature.xml
+++ b/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.repast-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.amf.target.repast"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.amf.ide.repast">
 
@@ -33,8 +33,8 @@
       <import plugin="org.eclipse.jdt.debug.ui"/>
       <import plugin="org.eclipse.jdt.debug"/>
       <import plugin="org.eclipse.jdt.core" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.ide" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.gen.ide" version="0.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.ide" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.gen.ide" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="repast.simphony.score" version="1.0.0" match="greaterOrEqual"/>
    </requires>
 
diff --git a/org.eclipse.amp.amf/features/org.eclipse.amp.amfx-feature/feature.xml b/org.eclipse.amp.amf/features/org.eclipse.amp.amfx-feature/feature.xml
index d344977..6e0daf1 100644
--- a/org.eclipse.amp.amf/features/org.eclipse.amp.amfx-feature/feature.xml
+++ b/org.eclipse.amp.amf/features/org.eclipse.amp.amfx-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.amfx"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.amf.abase">
 
@@ -27,31 +27,30 @@
 
    <requires>
       <import plugin="org.eclipse.xtext"/>
-      <import plugin="org.eclipse.ui" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.acore" version="0.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="org.eclipse.emf.common"/>
       <import plugin="org.antlr.runtime"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.amp.amf.acore"/>
       <import plugin="org.eclipse.xtext.util"/>
-      <import plugin="org.apache.commons.collections"/>
       <import plugin="org.apache.commons.lang"/>
       <import plugin="org.eclipse.emf.edit"/>
       <import plugin="org.eclipse.amp.amf.acore.edit"/>
       <import plugin="org.eclipse.emf.ecore.xmi"/>
       <import plugin="org.eclipse.emf.edit.ui"/>
-      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.abase.edit" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.abase" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.abase.ui" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.mwe.utils"/>
-      <import plugin="org.eclipse.xtext.ecore" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.amp.amf.abase.edit" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.abase" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.abase.ui" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui"/>
+      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui.shared"/>
       <import plugin="org.eclipse.xtext.builder"/>
       <import plugin="org.eclipse.xtext.ui.ecore" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.mwe.utils"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.amp.amf/features/org.eclipse.amp.amfx.feature/feature.xml b/org.eclipse.amp.amf/features/org.eclipse.amp.amfx.feature/feature.xml
index 3ea8daa..5757aa4 100644
--- a/org.eclipse.amp.amf/features/org.eclipse.amp.amfx.feature/feature.xml
+++ b/org.eclipse.amp.amf/features/org.eclipse.amp.amfx.feature/feature.xml
@@ -221,24 +221,31 @@
 
    <requires>
       <import plugin="org.eclipse.xtext"/>
-      <import plugin="org.eclipse.xtext.util"/>
       <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipse.amp.amf.acore" version="0.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.antlr.runtime"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.amp.amf.acore"/>
+      <import plugin="org.eclipse.amp.amf.abase"/>
+      <import plugin="org.eclipse.xtext.util"/>
+      <import plugin="org.apache.commons.lang"/>
       <import plugin="org.eclipse.emf.edit"/>
       <import plugin="org.eclipse.amp.amf.acore.edit"/>
+      <import plugin="org.eclipse.amp.amf.abase.edit"/>
       <import plugin="org.eclipse.emf.ecore.xmi"/>
       <import plugin="org.eclipse.emf.edit.ui"/>
       <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.xtext.ui.core"/>
-      <import plugin="org.eclipse.xtext.ui.common"/>
-      <import plugin="org.eclipse.xtext.log4j" version="1.2.15" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.amf.parameters" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.abase.edit" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.abase" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.amf.abase.ui" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui"/>
+      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui.shared"/>
+      <import plugin="org.eclipse.xtext.builder"/>
+      <import plugin="org.eclipse.xtext.ui.ecore" version="1.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase.edit/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase.edit/META-INF/MANIFEST.MF
index f393bb0..a0dabd2 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.abase.edit;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.amp.amf.abase.aBase.provider.ABaseEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase.editor/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase.editor/META-INF/MANIFEST.MF
index 629360b..b2038b4 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.abase.editor;singleton:=true
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.amp.amf.abase.aBase.presentation.ABaseEditorPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase.ui/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase.ui/META-INF/MANIFEST.MF
index 8462f9b..5ee0a61 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-SymbolicName: org.eclipse.amp.amf.abase.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.amp.amf.abase;visibility:=reexport,
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/META-INF/MANIFEST.MF
index 523a3a1..671624e 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.abase/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-SymbolicName: org.eclipse.amp.amf.abase;singleton:=true
 Eclipse-RegisterBuddy: org.eclipse.xtext.log4j
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/META-INF/MANIFEST.MF
index 2bd8064..ad4e358 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.edit/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.acore.edit;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.metaabm.provider.MetaABMEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.editor/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.editor/META-INF/MANIFEST.MF
index ccac78b..d50b019 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore.editor/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
  org.eclipse.emf.java;bundle-version="2.5.0",
  org.eclipse.ui.views.properties.tabbed
 Bundle-SymbolicName: org.eclipse.amp.amf.acore.editor;singleton=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Provide-Package: org.metaabm.act.ide,
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore/META-INF/MANIFEST.MF
index f2c03d5..d2a206b 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.acore/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.acore;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.data.edit/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.data.edit/META-INF/MANIFEST.MF
index ebd70ae..2b967a3 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.data.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.data.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.data.edit;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.amp.amf.adata.provider.ADataEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.data.editor/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.data.editor/META-INF/MANIFEST.MF
index 39a8bce..b4a9a91 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.data.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.data.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.data.editor;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.amp.amf.adata.presentation.ADataEditorPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.data/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.data/META-INF/MANIFEST.MF
index 6829b23..d305e5c 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.data/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.data/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.data;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.ascape/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.ascape/META-INF/MANIFEST.MF
index 5491549..78ae5ff 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.ascape/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.ascape/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.amp.amf.gen.ascape;singleton:=true
 Bundle-Name: %pluginName
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.amp.amf.acore,
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.escape/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.escape/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
index 86d6c39..e3a17da
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.escape/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.escape/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.amp.amf.gen.escape;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.amp.amf.acore,
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.extras/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.extras/META-INF/MANIFEST.MF
index e6d297f..5af553c 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.extras/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.extras/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.amp.amf.gen.extras;singleton:=true
 Bundle-Name: %pluginName
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.emf.ecore.editor,
  org.eclipse.jdt.core,
@@ -11,9 +11,9 @@
  org.eclipse.debug.ui,
  org.eclipse.amp.amf.acore,
  org.eclipse.core.runtime,
- org.eclipse.amp.amf.gen;bundle-version="0.8.0",
- org.eclipse.amp.amf.ide;bundle-version="0.8.0",
- org.eclipse.amp.amf.gen.ide;bundle-version="0.8.0"
+ org.eclipse.amp.amf.gen;bundle-version="0.8.1",
+ org.eclipse.amp.amf.ide;bundle-version="0.8.1",
+ org.eclipse.amp.amf.gen.ide;bundle-version="0.8.1"
 Export-Package: 
  metaabm.ext.tmpl,
  org.eclipse.amp.amf.gen.ext,
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.ide/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.ide/META-INF/MANIFEST.MF
index 2f9a7ad..0fec615 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.gen.ide;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.amf.gen.ide.GenIDEPlugin$Implementation
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.resources,
@@ -14,7 +14,7 @@
  org.eclipse.ui.ide,
  org.eclipse.xtend;bundle-version="1.0.0",
  org.eclipse.xtend.typesystem.emf;bundle-version="1.0.0",
- org.eclipse.amp.amf.gen;bundle-version="0.8.0"
+ org.eclipse.amp.amf.gen;bundle-version="0.8.1"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.repast/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.repast/META-INF/MANIFEST.MF
index e200962..f16689d 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.repast/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.repast/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.amp.amf.gen.repast;singleton:=true
 Bundle-Name: %pluginName
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.amp.amf.acore,
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen/META-INF/MANIFEST.MF
index 854171c..3a8ebe4 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.gen;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Localization: plugin
 Require-Bundle: 
  org.eclipse.emf.ecore,
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.ide.ascape/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.ide.ascape/META-INF/MANIFEST.MF
index 3a7c243..bc0feb3 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.ide.ascape/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.ide.ascape/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.ide.ascape;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.amf.ide.ascape.AscapeIDEActivator
 Bundle-Vendor: %providerName
 Require-Bundle: 
@@ -17,8 +17,8 @@
  org.eclipse.amp.amf.acore,
  org.eclipse.amp.amf.gen,
  org.eclipse.amp.amf.gen.ascape,
- org.eclipse.amp.amf.ide;bundle-version="0.8.0",
- org.eclipse.amp.amf.gen.ide;bundle-version="0.8.0",
+ org.eclipse.amp.amf.ide;bundle-version="0.8.1",
+ org.eclipse.amp.amf.gen.ide;bundle-version="0.8.1",
  org.eclipse.emf.ecore;bundle-version="2.5.0"
 Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.ide.repast/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.ide.repast/META-INF/MANIFEST.MF
index 9317263..806dcef 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.ide.repast/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.ide.repast/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.ide.repast;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.amf.ide.repast.RepastIDEActivator
 Bundle-Vendor: %providerName
 Require-Bundle: 
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.ide/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.ide/META-INF/MANIFEST.MF
index bd80911..9fd70be 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.ide;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.amf.ide.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/META-INF/MANIFEST.MF
index 27a4000..4b3ce45 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.parameters.edit;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.amp.amf.parameters.aPar.provider.AParEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.editor/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.editor/META-INF/MANIFEST.MF
index 956a92c..92e4cf4 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.parameters.editor;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.amp.amf.parameters.aPar.presentation.AParEditorPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -16,5 +16,5 @@
  org.eclipse.emf.edit.ui;visibility:=reexport,
  org.eclipse.ui.ide;visibility:=reexport,
  org.eclipse.amp.amf.acore.edit;visibility:=reexport,
- org.eclipse.amp.amf.abase.edit;bundle-version="0.8.0"
+ org.eclipse.amp.amf.abase.edit;bundle-version="0.8.1"
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.ui/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.ui/META-INF/MANIFEST.MF
index 52f9e6f..bfe52dc 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters.ui/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.amp.amf.parameters.ui; singleton:=true

-Bundle-Version: 0.8.0.qualifier

+Bundle-Version: 0.8.1.qualifier

 Bundle-ClassPath: .

 Bundle-Activator: org.eclipse.amp.amf.parameters.ui.internal.AParActivator

 Bundle-Vendor: %providerName

 Require-Bundle: org.eclipse.amp.amf.parameters,

- org.eclipse.amp.amf.abase;bundle-version="0.8.0",

- org.eclipse.amp.amf.abase.ui;bundle-version="0.8.0",

+ org.eclipse.amp.amf.abase;bundle-version="0.8.1",

+ org.eclipse.amp.amf.abase.ui;bundle-version="0.8.1",

  org.eclipse.amp.amf.acore,

  org.eclipse.xtext.ui,

  org.eclipse.ui.editors;bundle-version="3.5.0",

diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/META-INF/MANIFEST.MF
index e654152..170e16f 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.parameters/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-Vendor: %providerName

-Bundle-Version: 0.8.0.qualifier

+Bundle-Version: 0.8.1.qualifier

 Bundle-SymbolicName: org.eclipse.amp.amf.parameters;singleton:=true

 Eclipse-RegisterBuddy: org.eclipse.xtext.log4j

 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.edit/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.edit/META-INF/MANIFEST.MF
index 010c2d1..d5227b7 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.testing.edit;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.amp.amf.testing.ares.provider.AresEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -17,6 +17,6 @@
  org.eclipse.amp.amf.acore;visibility:=reexport,
  org.eclipse.amp.amf.acore.edit;visibility:=reexport,
  org.eclipse.amp.amf.testing;visibility:=reexport,
- org.eclipse.amp.amf.abase;bundle-version="0.8.0",
- org.eclipse.amp.amf.abase.edit;bundle-version="0.8.0"
+ org.eclipse.amp.amf.abase;bundle-version="0.8.1",
+ org.eclipse.amp.amf.abase.edit;bundle-version="0.8.1"
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.editor/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.editor/META-INF/MANIFEST.MF
index 141630b..c1f6297 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.testing.editor;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.amp.amf.testing.ares.presentation.AresEditorPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -18,6 +18,6 @@
  org.eclipse.ui.ide;visibility:=reexport,
  org.eclipse.amp.amf.parameters.edit;visibility:=reexport,
  org.eclipse.amp.amf.acore.edit;visibility:=reexport,
- org.eclipse.amp.amf.abase;bundle-version="0.8.0",
- org.eclipse.amp.amf.abase.edit;bundle-version="0.8.0"
+ org.eclipse.amp.amf.abase;bundle-version="0.8.1",
+ org.eclipse.amp.amf.abase.edit;bundle-version="0.8.1"
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/META-INF/MANIFEST.MF
index 8ca238a..c33067d 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing.ui/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.testing.ui;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.amp.amf.testing.ui.internal.ATestActivator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.amp.amf.testing,
- org.eclipse.amp.amf.abase;bundle-version="0.8.0",
- org.eclipse.amp.amf.abase.ui;bundle-version="0.8.0",
+ org.eclipse.amp.amf.abase;bundle-version="0.8.1",
+ org.eclipse.amp.amf.abase.ui;bundle-version="0.8.1",
  org.eclipse.amp.amf.acore,
  org.eclipse.xtext.ui,
  org.eclipse.ui.editors;bundle-version="3.5.0",
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/META-INF/MANIFEST.MF
index cacee31..4fec788 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.testing/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-SymbolicName: org.eclipse.amp.amf.testing; singleton:=true
 Eclipse-RegisterBuddy: org.eclipse.xtext.log4j
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.acore.edit.test/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.acore.edit.test/META-INF/MANIFEST.MF
index a51f12d..ec0c793 100644
--- a/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.acore.edit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.acore.edit.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.acore.edit.test
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.amf.acore.edit.tests.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.acore.test/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.acore.test/META-INF/MANIFEST.MF
index c8ece5b..3a3d81a 100644
--- a/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.acore.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.acore.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.amf.acore.test
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.metaabm.core.test.Activator
 Require-Bundle: 
  org.eclipse.core.runtime,
diff --git a/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.gen.ascape.test/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.gen.ascape.test/META-INF/MANIFEST.MF
index f4cf660..be09a78 100644
--- a/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.gen.ascape.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.gen.ascape.test/META-INF/MANIFEST.MF
@@ -3,17 +3,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Acore MetaABM Ascape Generator Test
 Bundle-SymbolicName: org.eclipse.amp.amf.gen.ascape.test
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.ascape.core;bundle-version="5.1.0",
  org.ascape.ui.swing;bundle-version="5.1.0",
- org.eclipse.amp.amf.gen.test;bundle-version="0.8.0",
+ org.eclipse.amp.amf.gen.test;bundle-version="0.8.1",
  org.eclipse.emf.mwe.core,
  org.eclipse.emf.mwe.ui,
  org.eclipse.jface.text;bundle-version="3.5.1",
  org.eclipse.xpand,
- org.eclipse.amp.amf.gen;bundle-version="0.8.0",
- org.eclipse.amp.amf.gen.ascape;bundle-version="0.8.0",
- org.eclipse.amp.amf.acore;bundle-version="0.8.0"
+ org.eclipse.amp.amf.gen;bundle-version="0.8.1",
+ org.eclipse.amp.amf.gen.ascape;bundle-version="0.8.1",
+ org.eclipse.amp.amf.acore;bundle-version="0.8.1"
 Bundle-ClassPath: .
 Import-Package: org.apache.commons.lang
diff --git a/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.gen.repast.test/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.gen.repast.test/META-INF/MANIFEST.MF
index e386662..f590b7b 100644
--- a/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.gen.repast.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.gen.repast.test/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Acore MetaABM repast Generator Test
 Bundle-SymbolicName: org.eclipse.amp.amf.gen.repast.test
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: 
- org.eclipse.amp.amf.gen;bundle-version="0.8.0",
- org.eclipse.amp.amf.gen.test;bundle-version="0.8.0",
+ org.eclipse.amp.amf.gen;bundle-version="0.8.1",
+ org.eclipse.amp.amf.gen.test;bundle-version="0.8.1",
  org.eclipse.jdt.junit,
  org.junit;bundle-version="3.8.2"
 Import-Package: org.apache.commons.collections
diff --git a/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.gen.test/META-INF/MANIFEST.MF b/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.gen.test/META-INF/MANIFEST.MF
index 0aa4cc6..32d97d1 100644
--- a/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.gen.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.amf/tests/org.eclipse.amp.amf.gen.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Test Acore MetaABM Model Generation
 Bundle-SymbolicName: org.eclipse.amp.amf.gen.test
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.ui,
@@ -11,7 +11,7 @@
  org.eclipse.jdt.ui,
  org.eclipse.ui.ide,
  org.eclipse.ui.ide.application;bundle-version="1.0.100",
- org.eclipse.amp.amf.gen.ide;bundle-version="0.8.0",
+ org.eclipse.amp.amf.gen.ide;bundle-version="0.8.1",
  org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
  org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
  org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0"
diff --git a/org.eclipse.amp.axf/features/org.eclipse.amp.axf-feature/feature.xml b/org.eclipse.amp.axf/features/org.eclipse.amp.axf-feature/feature.xml
index 2e11e7d..cf654a3 100644
--- a/org.eclipse.amp.axf/features/org.eclipse.amp.axf-feature/feature.xml
+++ b/org.eclipse.amp.axf/features/org.eclipse.amp.axf-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.axf"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.axf.core">
 
diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/META-INF/MANIFEST.MF b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/META-INF/MANIFEST.MF
index 79a90c9..cf1af5c 100644
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.amp.axf.core;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.axf.core.AXFPlugin
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide.test/META-INF/MANIFEST.MF b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide.test/META-INF/MANIFEST.MF
index d3b82ab..4a3e68b 100644
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Test AXF IDE
 Bundle-SymbolicName: org.eclipse.amp.axf.ide.test;singleton:=true
-Bundle-Version: 0.8.0
+Bundle-Version: 0.8.1
 Bundle-Activator: org.eclipse.amp.axf.ide.test.Activator
 Bundle-Vendor: eclipse.org
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide/META-INF/MANIFEST.MF b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide/META-INF/MANIFEST.MF
index efd5425..410308a 100644
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.amp.axf.ide;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.axf.ide.AXFWorkbenchPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.commands,
diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.views/META-INF/MANIFEST.MF b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.views/META-INF/MANIFEST.MF
index a9f1a13..48a9daf 100644
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.views/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.views/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.amp.axf.views;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.axf.view.AXFViewPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.commands,
diff --git a/org.eclipse.amp.escape/features/org.eclipse.amp.escape-feature/feature.xml b/org.eclipse.amp.escape/features/org.eclipse.amp.escape-feature/feature.xml
index b791dc7..31d034a 100644
--- a/org.eclipse.amp.escape/features/org.eclipse.amp.escape-feature/feature.xml
+++ b/org.eclipse.amp.escape/features/org.eclipse.amp.escape-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.escape"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.escape.ide">
 
@@ -36,11 +36,11 @@
       <import plugin="org.eclipse.ui" version="3.5.1" match="greaterOrEqual"/>
       <import plugin="org.ascape.core"/>
       <import plugin="org.eclipse.ui.views" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.axf.core" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.axf.views" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.axf.ide" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.agf.core" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.ascape.ui.amp" version="0.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.axf.core" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.axf.views" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.axf.ide" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.agf.core" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.ascape.ui.amp" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jface" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.ui" version="3.5.0" match="greaterOrEqual"/>
@@ -49,14 +49,14 @@
       <import plugin="org.eclipse.jdt.launching" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.console" version="3.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.escape.ascape.chart" version="0.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.escape.ascape.chart" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.core" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.lang"/>
       <import plugin="org.eclipse.birt.chart.engine" version="2.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.gef" version="3.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.agf.chart" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.escape.ascape" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.amp.agf.zest" version="0.8.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.agf.chart" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.escape.ascape" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.amp.agf.zest" version="0.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.core" version="3.5.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.ui" version="3.5.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.help.ui"/>
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.amf.ide/META-INF/MANIFEST.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.amf.ide/META-INF/MANIFEST.MF
index 26e673b..7309d2f 100644
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.amf.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.amf.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.escape.amf.ide;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.escape.amf.ide.EscapeAMFPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.amf.ide/res/MANIFEST_TEMPLATE.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.amf.ide/res/MANIFEST_TEMPLATE.MF
index a0e2c93..d06f4ed 100644
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.amf.ide/res/MANIFEST_TEMPLATE.MF
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.amf.ide/res/MANIFEST_TEMPLATE.MF
@@ -4,4 +4,4 @@
 Bundle-SymbolicName: %project_symbol%
 Bundle-Version: 1.0.0
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.amp.escape.runtime;bundle-version="0.8.0"
+Require-Bundle: org.eclipse.amp.escape.runtime;bundle-version="0.8.1"
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ascape.agf3d/META-INF/MANIFEST.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ascape.agf3d/META-INF/MANIFEST.MF
index 4d9a57f..1c547aa 100644
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ascape.agf3d/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ascape.agf3d/META-INF/MANIFEST.MF
@@ -3,19 +3,19 @@
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.amp.escape.ascape.agf3d;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.escape.ascape.agf3d.EscapeAscapeAGF3DPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime;visibility:=reexport,
  org.ascape.core,
- org.eclipse.amp.agf.core;bundle-version="0.8.0",
+ org.eclipse.amp.agf.core;bundle-version="0.8.1",
  org.ascape.ui.amp;bundle-version="0.8.0",
- org.eclipse.amp.axf.core;bundle-version="0.8.0",
- org.eclipse.amp.axf.views;bundle-version="0.8.0",
- org.eclipse.amp.escape.ascape;bundle-version="0.8.0",
- org.eclipse.amp.agf3d;bundle-version="0.8.0";visibility:=reexport,
- org.eclipse.gef3d;bundle-version="0.8.0";visibility:=reexport,
- org.eclipse.draw3d;bundle-version="0.8.0";visibility:=reexport,
+ org.eclipse.amp.axf.core;bundle-version="0.8.1",
+ org.eclipse.amp.axf.views;bundle-version="0.8.1",
+ org.eclipse.amp.escape.ascape;bundle-version="0.8.1",
+ org.eclipse.amp.agf3d;bundle-version="0.8.1";visibility:=reexport,
+ org.eclipse.gef3d;bundle-version="0.8.1";visibility:=reexport,
+ org.eclipse.draw3d;bundle-version="0.8.1";visibility:=reexport,
  org.eclipse.draw3d.geometry;bundle-version="0.8.0";visibility:=reexport,
  org.eclipse.draw3d.graphics3d;bundle-version="0.8.1";visibility:=reexport,
  org.lwjgl;bundle-version="2.2.1";visibility:=reexport,
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ascape.chart/META-INF/MANIFEST.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ascape.chart/META-INF/MANIFEST.MF
index c5c2ebc..06a38c7 100644
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ascape.chart/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ascape.chart/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.escape.ascape.chart;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.escape.ascape.chart.EscapeAscapeChartPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
@@ -10,10 +10,10 @@
  org.ascape.core,
  org.eclipse.birt.chart.engine;bundle-version="2.5.0",
  org.eclipse.gef,
- org.eclipse.amp.axf.views;bundle-version="0.8.0",
- org.eclipse.amp.agf.core;bundle-version="0.8.0",
- org.eclipse.amp.agf.chart;bundle-version="0.8.0",
- org.eclipse.amp.escape.ascape;bundle-version="0.8.0"
+ org.eclipse.amp.axf.views;bundle-version="0.8.1",
+ org.eclipse.amp.agf.core;bundle-version="0.8.1",
+ org.eclipse.amp.agf.chart;bundle-version="0.8.1",
+ org.eclipse.amp.escape.ascape;bundle-version="0.8.1"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.ascape.view.vis,
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ascape/META-INF/MANIFEST.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ascape/META-INF/MANIFEST.MF
index 3cfabbd..4a62c1c 100644
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ascape/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ascape/META-INF/MANIFEST.MF
@@ -3,17 +3,17 @@
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.amp.escape.ascape;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.escape.ascape.EscapeAscapeRuntimePlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.ui.views,
  org.ascape.core,
- org.eclipse.amp.axf.core;bundle-version="0.8.0",
- org.eclipse.amp.axf.views;bundle-version="0.8.0",
- org.eclipse.amp.agf.core;bundle-version="0.8.0",
- org.eclipse.amp.axf.ide;bundle-version="0.8.0",
- org.eclipse.amp.agf.zest;bundle-version="0.8.0"
+ org.eclipse.amp.axf.core;bundle-version="0.8.1",
+ org.eclipse.amp.axf.views;bundle-version="0.8.1",
+ org.eclipse.amp.agf.core;bundle-version="0.8.1",
+ org.eclipse.amp.axf.ide;bundle-version="0.8.1",
+ org.eclipse.amp.agf.zest;bundle-version="0.8.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.ascape.view.vis,
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/META-INF/MANIFEST.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/META-INF/MANIFEST.MF
index 6805dd7..41cb08c 100644
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.amp.escape.ide;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.escape.ide.EscapeIDEPlugin
 Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
@@ -25,17 +25,17 @@
  org.eclipse.jdt.launching,
  org.eclipse.ui.console,
  org.eclipse.ui.editors,
- org.eclipse.amp.axf.core;bundle-version="0.8.0",
+ org.eclipse.amp.axf.core;bundle-version="0.8.1",
  org.eclipse.amp.axf.views,
  org.eclipse.amp.axf.ide,
  org.eclipse.amp.agf.core,
  org.eclipse.amp.escape.ascape,
  org.ascape.core,
- org.eclipse.amp.agf3d;bundle-version="0.8.0";resolution:=optional,
- org.eclipse.amp.escape.ascape.agf3d;bundle-version="0.8.0";resolution:=optional,
- org.eclipse.amp.escape.ascape.chart;bundle-version="0.8.0",
+ org.eclipse.amp.agf3d;bundle-version="0.8.1";resolution:=optional,
+ org.eclipse.amp.escape.ascape.agf3d;bundle-version="0.8.1";resolution:=optional,
+ org.eclipse.amp.escape.ascape.chart;bundle-version="0.8.1",
  org.eclipse.jdt.ui;bundle-version="3.5.1",
- org.eclipse.amp.agf.zest;bundle-version="0.8.0";visibility:=reexport,
+ org.eclipse.amp.agf.zest;bundle-version="0.8.1";visibility:=reexport,
  org.eclipse.ui;bundle-version="3.6.0",
  org.eclipse.jdt.core,
  org.eclipse.help.ui
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/res/MANIFEST_TEMPLATE.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/res/MANIFEST_TEMPLATE.MF
index a0e2c93..d06f4ed 100644
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/res/MANIFEST_TEMPLATE.MF
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.ide/res/MANIFEST_TEMPLATE.MF
@@ -4,4 +4,4 @@
 Bundle-SymbolicName: %project_symbol%
 Bundle-Version: 1.0.0
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.amp.escape.runtime;bundle-version="0.8.0"
+Require-Bundle: org.eclipse.amp.escape.runtime;bundle-version="0.8.1"
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.runtime/META-INF/MANIFEST.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.runtime/META-INF/MANIFEST.MF
index aefd700..57ed9c4 100644
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.runtime/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.runtime/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.escape.runtime
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.escape.runtime.Activator
 Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
- org.eclipse.amp.axf.views;bundle-version="0.8.0";visibility:=reexport,
- org.eclipse.amp.axf.core;bundle-version="0.8.0";visibility:=reexport,
- org.eclipse.amp.agf.core;bundle-version="0.8.0";visibility:=reexport,
- org.eclipse.amp.escape.ascape;bundle-version="0.8.0";visibility:=reexport,
+ org.eclipse.amp.axf.views;bundle-version="0.8.1";visibility:=reexport,
+ org.eclipse.amp.axf.core;bundle-version="0.8.1";visibility:=reexport,
+ org.eclipse.amp.agf.core;bundle-version="0.8.1";visibility:=reexport,
+ org.eclipse.amp.escape.ascape;bundle-version="0.8.1";visibility:=reexport,
  org.ascape.ui.amp;bundle-version="0.8.0";visibility:=reexport,
- org.eclipse.amp.agf.chart;bundle-version="0.8.0";visibility:=reexport,
- org.eclipse.amp.escape.ascape.chart;bundle-version="0.8.0";visibility:=reexport,
+ org.eclipse.amp.agf.chart;bundle-version="0.8.1";visibility:=reexport,
+ org.eclipse.amp.escape.ascape.chart;bundle-version="0.8.1";visibility:=reexport,
  org.eclipse.birt.chart.engine;visibility:=reexport,
  org.eclipse.jface;visibility:=reexport,
  org.apache.commons.lang;resolution:=optional;visibility:=reexport,
- org.eclipse.amp.escape.ascape.agf3d;bundle-version="0.8.0";resolution:=optional;visibility:=reexport,
+ org.eclipse.amp.escape.ascape.agf3d;bundle-version="0.8.1";resolution:=optional;visibility:=reexport,
  org.apache.commons.collections;bundle-version="3.2.0";resolution:=optional;visibility:=reexport,
- org.eclipse.amp.agf.zest;bundle-version="0.8.0";resolution:=optional
+ org.eclipse.amp.agf.zest;bundle-version="0.8.1";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.testing.ide/META-INF/MANIFEST.MF b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.testing.ide/META-INF/MANIFEST.MF
index c8412fa..76c5b79 100644
--- a/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.testing.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.escape/plugins/org.eclipse.amp.escape.testing.ide/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.escape.testing.ide;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.amf.testing.ide.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.amp.amf.acore,
- org.eclipse.amp.amf.parameters;bundle-version="0.8.0",
- org.eclipse.amp.amf.testing;bundle-version="0.8.0",
+ org.eclipse.amp.amf.parameters;bundle-version="0.8.1",
+ org.eclipse.amp.amf.testing;bundle-version="0.8.1",
  org.eclipse.emf.ecore;bundle-version="2.5.0",
  org.eclipse.core.resources,
  org.ascape.core,
- org.eclipse.amp.escape.ide;bundle-version="0.8.0",
- org.eclipse.amp.axf.core;bundle-version="0.8.0",
- org.eclipse.amp.escape.ascape;bundle-version="0.8.0",
- org.eclipse.amp.axf.ide;bundle-version="0.8.0",
+ org.eclipse.amp.escape.ide;bundle-version="0.8.1",
+ org.eclipse.amp.axf.core;bundle-version="0.8.1",
+ org.eclipse.amp.escape.ascape;bundle-version="0.8.1",
+ org.eclipse.amp.axf.ide;bundle-version="0.8.1",
  org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
- org.eclipse.amp.amf.abase;bundle-version="0.8.0"
+ org.eclipse.amp.amf.abase;bundle-version="0.8.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.apache.commons.lang,
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/META-INF/MANIFEST.MF b/org.eclipse.amp/doc/org.eclipse.amp.doc/META-INF/MANIFEST.MF
index 34be92b..8595605 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.doc;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui.intro,
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.doc/build/ampPDF.xml b/org.eclipse.amp/doc/org.eclipse.amp.doc/build/ampPDF.xml
index f30dee5..5b43e22 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.doc/build/ampPDF.xml
+++ b/org.eclipse.amp/doc/org.eclipse.amp.doc/build/ampPDF.xml
@@ -3819,8 +3819,8 @@
 	</chapter>
 	<chapter id="New_and_Noteworthy">
 		<title>New and Noteworthy</title>
-		<section id="Release_0.8.0">
-			<title>Release 0.8.0</title>
+		<section id="Release_0.8.1">
+			<title>Release 0.8.1</title>
 			<para>The first official release of AMP includes many new or expanded features in addition to overall quality and usability improvements. The highlights are listed below.</para>
 			<section id="Model_Visualization">
 				<title>Model Visualization</title>
diff --git a/org.eclipse.amp/doc/org.eclipse.amp.ua/META-INF/MANIFEST.MF b/org.eclipse.amp/doc/org.eclipse.amp.ua/META-INF/MANIFEST.MF
index ebcad3b..2023b10 100644
--- a/org.eclipse.amp/doc/org.eclipse.amp.ua/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp/doc/org.eclipse.amp.ua/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.amp.ua;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.amp/features/org.eclipse.amp.all-feature/feature.properties b/org.eclipse.amp/features/org.eclipse.amp.all-feature/feature.properties
index 725323f..0ac122b 100644
--- a/org.eclipse.amp/features/org.eclipse.amp.all-feature/feature.properties
+++ b/org.eclipse.amp/features/org.eclipse.amp.all-feature/feature.properties
@@ -1,6 +1,6 @@
-featureName=AMP All-In-One SDK (Incubation)
+featureName=AMP All-In-One SDK (Incubation) [w/o AGF3D]
 
-description=All Agent Modeling Platform Components including source. Includes AMF, AXF, AGF and Escape.
+description=Agent Modeling Platform Components including source. Includes AMF, AXF, AGF and Escape. Does not include AGF3D as a third party dependency is required. For 3D support, install org.eclipse.amp.agf3d feature from the AMP update site. See: http://eclipse.org/amp/installing/updates.php.
 
 providerName=Eclipse Agent Modeling Platform
 
diff --git a/org.eclipse.amp/features/org.eclipse.amp.all-feature/feature.xml b/org.eclipse.amp/features/org.eclipse.amp.all-feature/feature.xml
index 91a1c74..7260dc6 100644
--- a/org.eclipse.amp/features/org.eclipse.amp.all-feature/feature.xml
+++ b/org.eclipse.amp/features/org.eclipse.amp.all-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.all"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.all">
 
@@ -44,10 +44,6 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.amp.agf3d"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.amp.amf.target.escape"
          version="0.0.0"/>
 
diff --git a/org.eclipse.amp/features/org.eclipse.amp.build/category.xml b/org.eclipse.amp/features/org.eclipse.amp.build/category.xml
index 70112e1..158e454 100644
--- a/org.eclipse.amp/features/org.eclipse.amp.build/category.xml
+++ b/org.eclipse.amp/features/org.eclipse.amp.build/category.xml
@@ -3,43 +3,43 @@
    <description>
       Tools for Agent Modeling, Execution and Graphics.
    </description>
-   <feature url="features/org.eclipse.amp.agf.chart_0.8.0.qualifier.jar" id="org.eclipse.amp.agf.chart" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.agf.chart_0.8.1.qualifier.jar" id="org.eclipse.amp.agf.chart" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.agf.zest_0.8.0.qualifier.jar" id="org.eclipse.amp.agf.zest" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.agf.zest_0.8.1.qualifier.jar" id="org.eclipse.amp.agf.zest" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.agf_0.8.0.qualifier.jar" id="org.eclipse.amp.agf" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.agf_0.8.1.qualifier.jar" id="org.eclipse.amp.agf" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.amf.core_0.8.0.qualifier.jar" id="org.eclipse.amp.amf.core" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.amf.core_0.8.1.qualifier.jar" id="org.eclipse.amp.amf.core" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.amf.target.escape_0.8.0.qualifier.jar" id="org.eclipse.amp.amf.target.escape" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.amf.target.escape_0.8.1.qualifier.jar" id="org.eclipse.amp.amf.target.escape" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.amf_0.8.0.qualifier.jar" id="org.eclipse.amp.amf" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.amf_0.8.1.qualifier.jar" id="org.eclipse.amp.amf" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.amfx_0.8.0.qualifier.jar" id="org.eclipse.amp.amfx" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.amfx_0.8.1.qualifier.jar" id="org.eclipse.amp.amfx" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.axf_0.8.0.qualifier.jar" id="org.eclipse.amp.axf" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.axf_0.8.1.qualifier.jar" id="org.eclipse.amp.axf" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.escape_0.8.0.qualifier.jar" id="org.eclipse.amp.escape" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.escape_0.8.1.qualifier.jar" id="org.eclipse.amp.escape" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.amf.target.ascape_0.8.0.qualifier.jar" id="org.eclipse.amp.amf.target.ascape" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.amf.target.ascape_0.8.1.qualifier.jar" id="org.eclipse.amp.amf.target.ascape" version="0.8.1.qualifier">
       <category name="Agent Modeling Extensions"/>
    </feature>
-   <feature url="features/org.eclipse.amp.amf.target.repast_0.8.0.qualifier.jar" id="org.eclipse.amp.amf.target.repast" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.amf.target.repast_0.8.1.qualifier.jar" id="org.eclipse.amp.amf.target.repast" version="0.8.1.qualifier">
       <category name="Agent Modeling Extensions"/>
    </feature>
-   <feature url="features/org.eclipse.amp.agf3d_0.8.0.qualifier.jar" id="org.eclipse.amp.agf3d" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.agf3d_0.8.1.qualifier.jar" id="org.eclipse.amp.agf3d" version="0.8.1.qualifier">
       <category name="Agent Modeling Extensions"/>
    </feature>
-   <feature url="features/org.eclipse.amp.doc.all_0.8.0.qualifier.jar" id="org.eclipse.amp.doc.all" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.doc.all_0.8.1.qualifier.jar" id="org.eclipse.amp.doc.all" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
    <category-def name="Agent Modeling" label="Agent Modeling">
diff --git a/org.eclipse.amp/features/org.eclipse.amp.build/feature.xml b/org.eclipse.amp/features/org.eclipse.amp.build/feature.xml
index b07cdb6..ad19035 100644
--- a/org.eclipse.amp/features/org.eclipse.amp.build/feature.xml
+++ b/org.eclipse.amp/features/org.eclipse.amp.build/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.build"
       label="Eclipse AMP Site"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="Eclipse Agent Modeling Project">
 
    <description url="http://eclipse.org/amp">
diff --git a/org.eclipse.amp/features/org.eclipse.amp.doc-feature/feature.xml b/org.eclipse.amp/features/org.eclipse.amp.doc-feature/feature.xml
index 74b158d..ebd075b 100644
--- a/org.eclipse.amp/features/org.eclipse.amp.doc-feature/feature.xml
+++ b/org.eclipse.amp/features/org.eclipse.amp.doc-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.doc"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.doc">
 
diff --git a/org.eclipse.amp/features/org.eclipse.amp.examples-feature/feature.xml b/org.eclipse.amp/features/org.eclipse.amp.examples-feature/feature.xml
index 2428383..99427df 100644
--- a/org.eclipse.amp/features/org.eclipse.amp.examples-feature/feature.xml
+++ b/org.eclipse.amp/features/org.eclipse.amp.examples-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.examples"
       label="%featureName"
-      version="0.8.0"
+      version="0.8.1"
       provider-name="%providerName">
 
    <description url="http://eclipse.org/amp">
diff --git a/org.eclipse.amp/features/org.eclipse.amp.source-feature/feature.xml b/org.eclipse.amp/features/org.eclipse.amp.source-feature/feature.xml
index 3fe0e71..e7113d6 100644
--- a/org.eclipse.amp/features/org.eclipse.amp.source-feature/feature.xml
+++ b/org.eclipse.amp/features/org.eclipse.amp.source-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.doc"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.amp.doc">
 
diff --git a/org.eclipse.amp/features/org.eclipse.amp.test-feature/feature.xml b/org.eclipse.amp/features/org.eclipse.amp.test-feature/feature.xml
index 9e757e0..817d7dd 100644
--- a/org.eclipse.amp/features/org.eclipse.amp.test-feature/feature.xml
+++ b/org.eclipse.amp/features/org.eclipse.amp.test-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.test"
       label="%featureName"
-      version="0.8.0"
+      version="0.8.1"
       provider-name="%providerName">
 
    <description url="http://eclipse.org/amp">
diff --git a/org.eclipse.amp/plugins/org.eclipse.amp.all/META-INF/MANIFEST.MF b/org.eclipse.amp/plugins/org.eclipse.amp.all/META-INF/MANIFEST.MF
index ce03f46..9e84329 100644
--- a/org.eclipse.amp/plugins/org.eclipse.amp.all/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp/plugins/org.eclipse.amp.all/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.all
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.Activator
 Require-Bundle: org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.amp/plugins/org.eclipse.amp.source/META-INF/MANIFEST.MF b/org.eclipse.amp/plugins/org.eclipse.amp.source/META-INF/MANIFEST.MF
index 93dcd6f..99c0361 100644
--- a/org.eclipse.amp/plugins/org.eclipse.amp.source/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp/plugins/org.eclipse.amp.source/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.amp.doc.all
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.amp.source.plugin.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
diff --git a/releng/org.eclipse.amp.build-feature/buckminster.cspex b/releng/org.eclipse.amp.build-feature/buckminster.cspex
index 696e737..3b6c865 100644
--- a/releng/org.eclipse.amp.build-feature/buckminster.cspex
+++ b/releng/org.eclipse.amp.build-feature/buckminster.cspex
@@ -51,7 +51,7 @@
 			</cs:actorProperties>
 			<cs:properties>
 				<cs:property key="content.ius"
-					value="org.eclipse.amp.examples.feature.group,org.eclipse.amp.examples.feature.group" />
+					value="org.eclipse.amp.examples.feature.group" />
 				<cs:property key="prerequisite.ius" value="org.eclipse.amp.all.feature.group" />
 				<cs:property key="package.name" value="amp-Examples" />
 			</cs:properties>
@@ -93,7 +93,11 @@
 		<cs:public name="build">
 			<cs:attribute name="package.amp-Update" />
  			<cs:attribute name="package.amp-SDK" />
+<<<<<<< HEAD
 		<!--		<cs:attribute name="package.amp-runtime" />
+=======
+	<!--			<cs:attribute name="package.amp-runtime" />
+>>>>>>> recovered-2
 		<cs:attribute name="package.amp-Examples" />
 			<cs:attribute name="package.amp-sourcedoc" /> -->
 		</cs:public>
diff --git a/releng/org.eclipse.amp.build-feature/category.xml b/releng/org.eclipse.amp.build-feature/category.xml
index 70112e1..03045e9 100644
--- a/releng/org.eclipse.amp.build-feature/category.xml
+++ b/releng/org.eclipse.amp.build-feature/category.xml
@@ -3,43 +3,49 @@
    <description>
       Tools for Agent Modeling, Execution and Graphics.
    </description>
-   <feature url="features/org.eclipse.amp.agf.chart_0.8.0.qualifier.jar" id="org.eclipse.amp.agf.chart" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.agf.chart_0.8.1.qualifier.jar" id="org.eclipse.amp.agf.chart" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.agf.zest_0.8.0.qualifier.jar" id="org.eclipse.amp.agf.zest" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.agf.zest_0.8.1.qualifier.jar" id="org.eclipse.amp.agf.zest" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.agf_0.8.0.qualifier.jar" id="org.eclipse.amp.agf" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.agf_0.8.1.qualifier.jar" id="org.eclipse.amp.agf" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.amf.core_0.8.0.qualifier.jar" id="org.eclipse.amp.amf.core" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.amf.core_0.8.1.qualifier.jar" id="org.eclipse.amp.amf.core" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.amf.target.escape_0.8.0.qualifier.jar" id="org.eclipse.amp.amf.target.escape" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.amf.target.escape_0.8.1.qualifier.jar" id="org.eclipse.amp.amf.target.escape" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.amf_0.8.0.qualifier.jar" id="org.eclipse.amp.amf" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.amf_0.8.1.qualifier.jar" id="org.eclipse.amp.amf" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.amfx_0.8.0.qualifier.jar" id="org.eclipse.amp.amfx" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.amfx_0.8.1.qualifier.jar" id="org.eclipse.amp.amfx" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.axf_0.8.0.qualifier.jar" id="org.eclipse.amp.axf" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.axf_0.8.1.qualifier.jar" id="org.eclipse.amp.axf" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.escape_0.8.0.qualifier.jar" id="org.eclipse.amp.escape" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.escape_0.8.1.qualifier.jar" id="org.eclipse.amp.escape" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
-   <feature url="features/org.eclipse.amp.amf.target.ascape_0.8.0.qualifier.jar" id="org.eclipse.amp.amf.target.ascape" version="0.8.0.qualifier">
-      <category name="Agent Modeling Extensions"/>
+   <feature url="features/org.eclipse.amp.amf.target.ascape_0.8.1.qualifier.jar" id="org.eclipse.amp.amf.target.ascape" version="0.8.1.qualifier">
+      <category name="Agent Modeling (Requiring Third Party Dependencies)"/>
    </feature>
-   <feature url="features/org.eclipse.amp.amf.target.repast_0.8.0.qualifier.jar" id="org.eclipse.amp.amf.target.repast" version="0.8.0.qualifier">
-      <category name="Agent Modeling Extensions"/>
+   <feature url="features/org.eclipse.amp.amf.target.repast_0.8.1.qualifier.jar" id="org.eclipse.amp.amf.target.repast" version="0.8.1.qualifier">
+      <category name="Agent Modeling (Requiring Third Party Dependencies)"/>
    </feature>
-   <feature url="features/org.eclipse.amp.agf3d_0.8.0.qualifier.jar" id="org.eclipse.amp.agf3d" version="0.8.0.qualifier">
-      <category name="Agent Modeling Extensions"/>
+   <feature url="features/org.eclipse.amp.agf3d_0.8.1.qualifier.jar" id="org.eclipse.amp.agf3d" version="0.8.1.qualifier">
+      <category name="Agent Modeling (Requiring Third Party Dependencies)"/>
    </feature>
-   <feature url="features/org.eclipse.amp.doc.all_0.8.0.qualifier.jar" id="org.eclipse.amp.doc.all" version="0.8.0.qualifier">
+   <feature url="features/org.eclipse.amp.doc.all_0.8.1.qualifier.jar" id="org.eclipse.amp.doc.all" version="0.8.1.qualifier">
+      <category name="Agent Modeling"/>
+   </feature>
+   <feature url="features/org.eclipse.amp.all_0.8.1.qualifier.jar" id="org.eclipse.amp.all" version="0.8.1.qualifier">
+      <category name="Agent Modeling"/>
+   </feature>
+   <feature url="features/org.eclipse.amp.doc_0.8.1.qualifier.jar" id="org.eclipse.amp.doc" version="0.8.1.qualifier">
       <category name="Agent Modeling"/>
    </feature>
    <category-def name="Agent Modeling" label="Agent Modeling">
@@ -47,9 +53,9 @@
          Eclipse Agent Modeling Project tools, including Agent Modeling Framework, Agent eXectution Framework, Agent Graphics Framework, and Escape.
       </description>
    </category-def>
-   <category-def name="Agent Modeling Extensions" label="Agent Modeling Extensions">
+   <category-def name="Agent Modeling (Requiring Third Party Dependencies)" label="Agent Modeling Extensions">
       <description>
-         Optional features for the Eclipse Agent Modeling Project, including support for 3D graphics, and Ascape and Repast targets. All of these targets require additional non-Eclipse hosted plugins. Please see individual features for details.
+         This category include Eclipse Agent Modeling Project components that require third party (non Eclipse-IP) support, including support for 3D graphics, and Ascape and Repast targets. You should include AGF3D in any AMP installation if possible. To do so, add http://lwjgl.org/update to your updates sites. Please see individual features for details on other components.
       </description>
    </category-def>
 </site>
diff --git a/releng/org.eclipse.amp.build-feature/feature.xml b/releng/org.eclipse.amp.build-feature/feature.xml
index a16a5b4..6ea5828 100644
--- a/releng/org.eclipse.amp.build-feature/feature.xml
+++ b/releng/org.eclipse.amp.build-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.amp.build"
       label="Eclipse AMP Site"
-      version="0.8.0.qualifier"
+      version="0.8.1.qualifier"
       provider-name="Eclipse Agent Modeling Project">
 
    <description url="http://eclipse.org/amp">
@@ -29,5 +29,12 @@
    <includes
          id="org.eclipse.amp.test"
          version="0.0.0"/>
+<<<<<<< HEAD
+=======
+
+   <includes
+         id="org.eclipse.amp.agf3d"
+         version="0.0.0"/>
+>>>>>>> recovered-2
 
 </feature>
diff --git a/releng/org.eclipse.amp.releng/buckminster.cspec b/releng/org.eclipse.amp.releng/buckminster.cspec
index b0f0b39..a5e36c3 100644
--- a/releng/org.eclipse.amp.releng/buckminster.cspec
+++ b/releng/org.eclipse.amp.releng/buckminster.cspec
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.amp.releng" componentType="buckminster" version="0.8.0.qualifier">
+<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.amp.releng" componentType="buckminster" version="0.8.1.qualifier">
     <cs:dependencies>
         <cs:dependency name="org.eclipse.emf" componentType="eclipse.feature"/>
         <cs:dependency name="org.eclipse.swtbot" componentType="eclipse.feature"/>
diff --git a/releng/org.eclipse.amp.releng/promoter.ant b/releng/org.eclipse.amp.releng/promoter.ant
index 3d79bd2..48d1326 100644
--- a/releng/org.eclipse.amp.releng/promoter.ant
+++ b/releng/org.eclipse.amp.releng/promoter.ant
@@ -18,6 +18,11 @@
 			<entry key="eclipse.home" value="${eclipse.home}" />
 			<entry key="build.id" value="${build.id}" />
 			<entry key="hudson.build.id" value="${hudson.build.id}" />
+<<<<<<< HEAD
+=======
+			<entry key="packages.base" value="amp.downloads" />
+			<entry key="downloads.area" value="/home/data/httpd/download.eclipse.org/amp" />
+>>>>>>> recovered-2
 		</propertyfile>
 
 		<!-- diagnostics
@@ -281,4 +286,4 @@
 	<target name="echo-status" if="alreadyPromoted">
 		<echo>Build ${saved.build.id} already promoted, nothing to do...</echo>
 	</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/releng/org.eclipse.amp.releng/publisher.properties b/releng/org.eclipse.amp.releng/publisher.properties
index 14cc224..3535fec 100644
--- a/releng/org.eclipse.amp.releng/publisher.properties
+++ b/releng/org.eclipse.amp.releng/publisher.properties
@@ -1,4 +1,11 @@
+<<<<<<< HEAD
 version=0.8.0
 packages.base=amp.downloads
 tests.base=amp.test.results
 downloads.area=/home/data/httpd/download.eclipse.org/amp/
+=======
+version=0.8.1
+packages.base=amp.downloads
+tests.base=amp.test.results
+downloads.area=/home/data/httpd/download.eclipse.org/amp/
+>>>>>>> recovered-2
diff --git a/releng/org.eclipse.amp.releng/releng/amp-platform.rmap b/releng/org.eclipse.amp.releng/releng/amp-platform.rmap
index c52af20..db3509e 100644
--- a/releng/org.eclipse.amp.releng/releng/amp-platform.rmap
+++ b/releng/org.eclipse.amp.releng/releng/amp-platform.rmap
@@ -55,6 +55,13 @@
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
+  <rm:searchPath name="birt">
+    <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+      <rm:uri format="http://download.eclipse.org/birt/update-site/4.0-interim/">
+        <bc:propertyRef key="eclipse.download"/>
+      </rm:uri>
+    </rm:provider>
+  </rm:searchPath>
   <rm:searchPath name="emf">
     <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
       <rm:uri format="{0}/modeling/emf/emf/updates/2.6milestones">
diff --git a/releng/org.eclipse.amp.releng/releng/amp.rmap b/releng/org.eclipse.amp.releng/releng/amp.rmap
index ffdb5fc..003d995 100644
--- a/releng/org.eclipse.amp.releng/releng/amp.rmap
+++ b/releng/org.eclipse.amp.releng/releng/amp.rmap
@@ -242,14 +242,14 @@
 		</rm:provider>
 	</rm:searchPath>
 	<rm:searchPath name="gef3d">
-		<rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="svn">
+		<rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="svn" mutable="false">
 			<rm:uri format="http://dev.eclipse.org/svnroot/technology/org.eclipse.gef3d/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
 				<bc:propertyRef key="buckminster.component" />
 			</rm:uri>
 		</rm:provider>
 	</rm:searchPath>
 	<rm:searchPath name="gef3d-build">
-		<rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="svn">
+		<rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="svn" mutable="false">
 			<rm:uri format="file:///svnroot/technology/org.eclipse.gef3d/trunk/{0}?moduleAfterTag&amp;moduleAfterBranch">
 				<bc:propertyRef key="buckminster.component" />
 			</rm:uri>