Merge branch 'dev' into dev

diff --combined .travis.yml
index 71bfc442b417b22b591c84ef9100ce1258776e5c,698895c09bc86b53fb07040561cd7bd5c6db2a1c..f55afb8a9c579811098f8f6f83904425b494314f
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -1,17 -1,11 +1,17 @@@
  language: java
  before_install:
 -  - sudo apt-get install junit4
    - mkdir ~/junit
    - ln -s /usr/share/java/junit4.jar ~/junit
    - ln -s /usr/share/java/hamcrest-core.jar ~/junit
    - export JUNIT_HOME=~/junit
 +
  install: ant test
 +
  jdk:
    - oraclejdk8
 -  - openjdk8
 +
 +addons:
 +  apt:
 +    packages:
 +      - oracle-java8-installer
-       - junit4
++      - junit4