Merge branch 'fix/ci' into 'dev'

Change ci pipeline to only run in master, dev and on merge requests

See merge request !41

.gitlab-ci.yml

@@ -10,12 +10,20 @@ cache:
 
 build:
   stage: build
+  only:
+    - dev
+    - master
+    - merge_requests
   script:
     - echo "Building project with maven"
     - mvn verify
 
 test:
   stage: test
+  only:
+    - dev
+    - master
+    - merge_requests
   script:
     - echo "Running project tests with maven"
     - mvn test