Merge remote-tracking branch 'origin/master' into release

platform/hale-platform.target

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="eu.esdihumboldt.hale.platform" sequenceNumber="258">
+<?pde version="3.8"?><target name="eu.esdihumboldt.hale.platform" sequenceNumber="259">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="de.fhg.igd.equinox.test.feature.feature.group" version="1.1.0.201503301812"/>
@@ -30,10 +30,6 @@
 <repository location="http://hale.igd.fraunhofer.de/jenkins/view/p2/job/site-sqlite-osgi/2/updatesite"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="eu.esdihumboldt.hale.platform.feature.group" version="3.0.0.i20151027"/>
-<repository location="http://hale.igd.fraunhofer.de/build-support/a104934a454ae6e9ec2dab09ff875acabed6cac3/updatesites/platform"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.sdk.ide" version="4.4.2.M20150204-1700"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.4"/>
 </location>
@@ -51,5 +47,9 @@
 <unit id="org.eclipse.jetty.bundles.f.feature.group" version="8.1.18.201510140934"/>
 <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x/8.1.18.v20150929"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="eu.esdihumboldt.hale.platform.feature.group" version="3.0.0.i20151101"/>
+<repository location="http://hale.igd.fraunhofer.de/build-support/a0201398e6f82efaabd3f4aa80c35bef0b47e2b7/updatesites/platform"/>
+</location>
 </locations>
 </target>