Merge branch 'develop' into Hebaallahibrahim-patch-1

Author: LorenzBuehmann

.gitignore

@@ -1,5 +1,6 @@
 *.class
 *.log
+*.swp
 
 # sbt specific
 .cache
@@ -20,5 +21,19 @@ project/plugins/project/
 
 scalastyle-output.xml
 
+# eclipse conf file
+.settings
+.classpath
+.project
+.manager
+.scala_dependencies
+.cashe
+.cache-main
+.cache-tests
+.classpath
+#.coveralls.yml
+deptree.txt
+
+
 # Protege files
 catalog-v001.xml

.travis.yml

@@ -4,7 +4,9 @@ cache:
   directories:
     - $HOME/.m2
 scala:
-  - 2.11.11
+  - 2.11.12
+jdk:
+  - openjdk8
 script:
   - mvn scalastyle:check
-  - mvn test
+  - mvn test