Merge branch 'master' into monitoring

Conflicts:
 build.gradle
 bundle/src/main/java/org/jumbodb/starter/JumboDBStarter.java
 database/src/main/webapp/partials/overview.html
 gradle.properties