test both oraclejdk7 and openjdk 6. remove branch whitelist
Merge branch 'develop' of github.com:ontop/ontop into develop