Merge remote-tracking branch 'origin/java' into java

# Conflicts:
#	build.gradle

Merge remote-tracking branch 'origin/java' into java

# Conflicts:
#	build.gradle

Merge remote-tracking branch 'origin/java' into java

# Conflicts:
#	build.gradle

Update README.md