merge develop into master

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id "java"
     id "distribution"
     id "eclipse"
-    id "org.sonarqube" version "2.1-rc2"
+    id "org.sonarqube" version "2.1"
     id "edu.sc.seis.launch4j" version "1.6.2"
     id "com.github.johnrengelman.shadow" version "1.2.3"
     id "com.github.hierynomus.license" version "0.13.1"
@@ -26,7 +26,7 @@ ext {
     pircbotVersion = "1.5.0"
     richtextfxVersion = "0.6.10"
     fontawesomefxVersion = "8.9"
-    controlsfxVersion = "8.40.11"
+    controlsfxVersion = "8.40.12"
     gsonVersion = "2.7"
     httpclientVersion = "4.5.2"
     slf4jVersion = "1.7.21"
@@ -46,10 +46,16 @@ dependencies {
     compile "org.apache.logging.log4j:log4j-core:$log4jVersion"
     compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
     compile "org.apache.logging.log4j:log4j-jul:$log4jVersion"
-    testCompile files(System.getProperty("java.home") + "/lib/ext/jfxrt.jar" )
+    compile "com.github.zafarkhaja:java-semver:0.9.0"
     testCompile "junit:junit:$junitVersion"
 }
 
+sonarqube  {
+    properties  {
+        property "sonar.sourceEncoding", "UTF-8"
+    }
+}
+
 jar {
     manifest {
         attributes "Implementation-Title": "LivestreamerGUI FatJar",

src/main/java/app/lsgui/LsGUI.java

@@ -26,26 +26,23 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import app.lsgui.gui.LsGUIWindow;
+import app.lsgui.gui.main.LsGuiWindow;
 import javafx.application.Application;
 
 /**
  *
  * @author Niklas 11.06.2016
  *
  */
-public class LsGUI {
+public final class LsGUI {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LsGUI.class);
 
     private LsGUI() {
     }
 
     public static void main(String[] args) {
-        System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager");
-
         LOGGER.debug("Pre-Launch finished");
-
-        Application.launch(LsGUIWindow.class, args);
+        Application.launch(LsGuiWindow.class, args);
     }
 }