fix remaining Javadoc problems
Merge remote-tracking branch 'origin/master'
update to gradlew 1.7 because IntelliJ works better with that