diff --git a/org.eclipse.ogee.core/META-INF/MANIFEST.MF b/org.eclipse.ogee.core/META-INF/MANIFEST.MF
index eedba62..3eaaf3a 100644
--- a/org.eclipse.ogee.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.ogee.core/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@
  org.eclipse.core.resources;bundle-version="3.8.0",
  org.eclipse.ogee.utils,
  org.eclipse.ogee.model,
- org.eclipse.help.ui,
  org.eclipse.emf.ecore,
  org.eclipse.ogee.model.api,
  org.eclipse.ogee.import,
diff --git a/org.eclipse.ogee.designer/contextHelp_editor.xml b/org.eclipse.ogee.designer/contextHelp_editor.xml
index 73f1250..876156d 100644
--- a/org.eclipse.ogee.designer/contextHelp_editor.xml
+++ b/org.eclipse.ogee.designer/contextHelp_editor.xml
@@ -1,6 +1,6 @@
 <contexts>
 	<context id="odataeditor" title="OData Model Editor">
-    <topic href="../org.eclipse.ogee.help/html/Working with the OData Model Editor.html" label="odataeditor"/>
+    <topic href="../org.eclipse.ogee.help/html/Working in the OData Model Editor.html" label="odataeditor"/>
     
     
     <!--topic label="Graphical OData Editor UI"/>
diff --git a/org.eclipse.ogee.designer/src/org/eclipse/ogee/designer/ODataMultiPageEditor.java b/org.eclipse.ogee.designer/src/org/eclipse/ogee/designer/ODataMultiPageEditor.java
index af59cbc..a1f034c 100644
--- a/org.eclipse.ogee.designer/src/org/eclipse/ogee/designer/ODataMultiPageEditor.java
+++ b/org.eclipse.ogee.designer/src/org/eclipse/ogee/designer/ODataMultiPageEditor.java
@@ -759,23 +759,12 @@
 						.getGraphicalViewer();
 				if (graphicalViewer != null) {
 					final Control control = graphicalViewer.getControl();
-					/*PlatformUI
-							.getWorkbench()
-							.getHelpSystem()
-							.setHelp(control,
-									IODataEditorConstants.HELP_CONTEXT_ID);*/
 					PlatformUI.getWorkbench().getHelpSystem()
 					.setHelp(control, IHelpConstants.HELP_CONTEXT_ID);
 				}
 			}
 			break;
 		case 1:
-			/*PlatformUI
-					.getWorkbench()
-					.getHelpSystem()
-					.setHelp(
-							this.edmxReferencePage,
-							IODataEditorConstants.HELP_CONTEXT_ID_EDMXREFERENCES);*/
 			PlatformUI
 			.getWorkbench()
 			.getHelpSystem()
diff --git a/org.eclipse.ogee.export/META-INF/MANIFEST.MF b/org.eclipse.ogee.export/META-INF/MANIFEST.MF
index a38d255..67c91a2 100644
--- a/org.eclipse.ogee.export/META-INF/MANIFEST.MF
+++ b/org.eclipse.ogee.export/META-INF/MANIFEST.MF
@@ -6,10 +6,12 @@
 Bundle-Version: 0.6.0.qualifier
 Bundle-Activator: org.eclipse.ogee.export.Activator
 Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.ogee.model,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.100",
+ org.eclipse.jface;bundle-version="3.9.1",
+ org.eclipse.ui;bundle-version="3.105.0",
+ org.eclipse.ogee.model,
  org.eclipse.ogee.help,
- org.eclipse.ogee.utils,
- org.eclipse.help.ui
+ org.eclipse.ogee.utils
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.resources,
diff --git a/org.eclipse.ogee.export/src/org/eclipse/ogee/export/wizard/page/ModelExportSourceButtonListener.java b/org.eclipse.ogee.export/src/org/eclipse/ogee/export/wizard/page/ModelExportSourceButtonListener.java
index 45b45f2..2e19588 100644
--- a/org.eclipse.ogee.export/src/org/eclipse/ogee/export/wizard/page/ModelExportSourceButtonListener.java
+++ b/org.eclipse.ogee.export/src/org/eclipse/ogee/export/wizard/page/ModelExportSourceButtonListener.java
@@ -20,6 +20,7 @@
 import org.eclipse.ui.model.BaseWorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 
+
 public class ModelExportSourceButtonListener implements SelectionListener {
 	private ModelExportMainPage modelExportPage;
 
diff --git a/org.eclipse.ogee.help/html/Basic Layout.html b/org.eclipse.ogee.help/html/Basic Layout.html
index 5cb1ea5..53d3411 100644
--- a/org.eclipse.ogee.help/html/Basic Layout.html
+++ b/org.eclipse.ogee.help/html/Basic Layout.html
@@ -15,7 +15,7 @@
 <li class="li step stepexpand" id="loiof159edb90e754bd78496eec86c7e66ea__step_N10039_N1001E_N10012_N10001"><span class="ph cmd">Expand <b>OData Development</b> and choose <b>OData Model Editor</b>.
 						</span>.</span><div class="itemgroup stepresult">The OData Model Editor Layout options opens in the details region and the Basic
 					Layout is selected by default. Here is a sample of the basic layouting:
-							<p class="p"><img src="Basiclayout1.png" alt="basic Layout" style="width:240px;height:300px"/></p>
+							<p><img src="BasicLayout1.png" alt="basic Layout" style="width:240px;height:300px"/></p>
 <div class="p">The basic layout avoids overlapping of the
 						models and layouts the model in the following order:<ol class="ol" type="a" id="loiof159edb90e754bd78496eec86c7e66ea__ol_f3y_mdw_fj"><li class="li">Self associated entities and non-associated entitites.</li>
 <li class="li">Associated entities</li>
@@ -26,7 +26,7 @@
 							can also select a layout by right clicking on the OData Model Editor and
 							choosing <strong class="ph b">Layout</strong> and selecting a layout of your choice from the
 							context menu. If there are no extra layouts other than basic, then no
-							additional layout(s) will be displayed.<p class="p"><img src="Basiclayout2.png" alt="basic Layout" style="width:240px;height:200px"/></p>
+							additional layout(s) will be displayed.<p><img src="BasicLayout2.png" alt="basic Layout" style="width:240px;height:200px"/></p>
 </div>
 </div>
 </div></li>
diff --git a/org.eclipse.ogee.help/html/Creating a OData Model.html b/org.eclipse.ogee.help/html/Creating a OData Model.html
index 22e9e6c..fba03dd 100644
--- a/org.eclipse.ogee.help/html/Creating a OData Model.html
+++ b/org.eclipse.ogee.help/html/Creating a OData Model.html
@@ -21,7 +21,7 @@
 <div class="p">After creating a project as detailed in the <a class="xref" href="Creating a Project.html" title="Creating a project">Creating a Project</a> section, the next step is to define the attributes for creating a OData model. Once
 			the project is successfully created, the project folder appears in the project explorer
 			region. The next step is to create an OData model. <span class="ph emphasis emphasis">OData Modeler</span>
-			provides multiple options to create an OData Model:<ul class="ul" id="Creating a Blank OData Model.html"><li class="li">From a Blank OData Model. See <a class="xref" href="Creating a Blank OData Model.html" title="Creating a blank OData model.">Creating a Blank OData Model</a> for more information.</li>
+			provides multiple options to create an OData Model. The supported OData version is V2.<ul class="ul" id="Creating a Blank OData Model.html"><li class="li">From a Blank OData Model. See <a class="xref" href="Creating a Blank OData Model.html" title="Creating a blank OData model.">Creating a Blank OData Model</a> for more information.</li>
 <li class="li">From a OData service metadata url. See <a class="xref" href="Creating an OData Model Using Service URL.html">Creating an OData Model Using Service URL</a> for more information.</li>
 <li class="li">From a OData service metadata file. See <a class="xref" href="Creating an OData Model Using Metadata File.html">Creating an OData Model Using Metadata File</a> for more information.</li>
 </ul>
diff --git a/org.eclipse.ogee.target/org.eclipse.ogee.target b/org.eclipse.ogee.target/org.eclipse.ogee.target
index b590421..c0005b1 100644
--- a/org.eclipse.ogee.target/org.eclipse.ogee.target
+++ b/org.eclipse.ogee.target/org.eclipse.ogee.target
@@ -39,7 +39,7 @@
 <unit id="org.eclipse.xtend.ui.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.xtext.ui.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.xtext.xtext.ui.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/kepler"/>
+<repository location="http://download.eclipse.org/releases/luna"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.olingo" version="2.0.2.v201502271535"/>