Merge branch 'develop'

Author: W1nt0r

bintray.json

@@ -9,14 +9,14 @@
     ]
   },
   "version": {
-    "name": "1.2",
-    "released": "2018-12-07",
+    "name": "2.0",
+    "released": "2018-12-14",
     "gpgSign": false
   },
   "files": [
     {
       "includePattern": "build/libs/(.*)",
-      "uploadPattern": "/ch/hsr/adv/adv-ui/1.2/$1",
+      "uploadPattern": "/ch/hsr/adv/adv-ui/2.0/$1",
       "matrixParams": {
         "override": 1
       }

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'ch.hsr.adv'
-version = '1.2'
+version = '2.0'
 
 /****************************************
  * instructions for all projects
@@ -221,6 +221,16 @@ def pomConfig = {
             name 'Muriele Trentini'
             email 'mtrentin@hsr.ch'
         }
+        developer {
+            id 'jwinter'
+            name 'Jan Winter'
+            email 'jwinter@hsr.ch'
+        }
+        developer {
+            id 'f2meier'
+            name 'Fabian Meier'
+            email 'f2meier@hsr.ch'
+        }
     }
 
     scm {

ui-core/build.gradle

@@ -30,7 +30,7 @@ dependencies {
 
 
     // common dependencies
-    compile('ch.hsr.adv:adv-commons:1.2')
+    compile('ch.hsr.adv:adv-commons:2.0')
 }
 
 mainClassName = 'ADVApplication'