Merge branch 'dev' into dev

diff --cc .travis.yml
index 71bfc44,698895c..f55afb8
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -4,14 -5,7 +4,14 @@@ before_install
    - 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