Merge origin/master

ch.psi.plot/.classpath

@@ -27,7 +27,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

ch.psi.plot/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

ch.psi.plot/pom.xml

@@ -41,8 +41,8 @@
                                 <version>3.1</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
-					<source>1.7</source>
+					<source>1.8</source>
-					<target>1.7</target>                                              
+					<target>1.8</target>                                              
 				</configuration>
 			</plugin> 
 			<!-- Generate Javadoc Jar -->
@@ -83,12 +83,12 @@
 		<snapshotRepository>
 			<id>i.snapshots</id>
 			<name>Artifactory Snapshots</name>
-			<url>http://yoke/artifactory/libs-snapshots-local</url>
+			<url>http://yoke.psi.ch:8081/artifactory/libs-snapshots-local</url>
 		</snapshotRepository>
 		<repository>
 			<id>i.releases</id>
 			<name>Atrifactory Releases</name>
-			<url>http://yoke/artifactory/libs-releases-local</url>
+			<url>http://yoke.psi.ch:8081/artifactory/libs-releases-local</url>
 		</repository>
 	</distributionManagement>
         <!-- G