Merge branch 'develop' into angular-update

.gitlab-ci.yml

+stages:
+  - test
+  - sonar
+
+test:
+  stage: test
+  image: trion/ng-cli-karma:14.2.1
+  script:
+    - npm ci --force
+    - ng build
+    - ng test --code-coverage --watch=false --browsers=Chrome
+
+sonar:
+  stage: sonar
+  image: trion/ng-cli-karma:14.2.1
+  only:
+    - develop
+  script:
+    - npm ci --force
+    - chmod +x ./gradlew
+    - ./gradlew testCoverage
+    - ./gradlew -Dsonar.host.url=${SONAR_HOST} -Dsonar.projectKey=${SONAR_PROJECT_KEY} -Dsonar.projectName=${SONAR_PROJECT_NAME} -Dsonar.branch.name=develop -Dsonar.login=${SONAR_LOGIN_TOKEN} sonarqube

build.gradle

@@ -5,7 +5,7 @@ plugins {
 	id "org.sonarqube" version "3.2.0"
 }
 
-version = '1.6.0'
+version = '1.6.1-SNAPSHOT'
 
 task buildGUI(type: Exec) {
 	println 'Building using Angular CLI'