Merge branch 'next' of https://github.com/eclipse/ice into next

org.eclipse.ice.product/ice.product

@@ -136,6 +136,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <feature id="org.eclipse.ease.modules.charting.feature"/>
       <feature id="org.eclipse.ease.modules.feature"/>
       <feature id="org.eclipse.ease.python.feature"/>
+      <feature id="org.eclipse.ease.python.jython.feature"/>
       <feature id="org.eclipse.ease.ui.feature"/>
       <feature id="org.eclipse.epp.mpc"/>
       <feature id="org.eclipse.remote"/>

org.eclipse.ice.target.neon/neon.target

@@ -4,14 +4,19 @@
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.ease.ui.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.ease.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ease.javascript.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ease.modules.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.ease.modules.charting.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.ease.modules.team.svn.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ease.python.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.ease.modules.unittest.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ease.javascript.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ease.modules.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ease.python.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ease.python.jython.feature.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/ease/update/nightly"/>
 </location>
+<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+<unit id="org.eclipse.ease.engine.jython.feature.feature.group" version="2.7.0.I201604140914"/>
+<repository location="http://bintray.com/artifact/download/pontesegger/ease-engines/"/>
+</location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="ca.odell.glazedlists" version="0.0.0"/>
 <unit id="com.google.gson" version="0.0.0"/>