Merge branch '04-java-plugin'

Conflicts:
	.gitignore
	README.md
	build.gradle
	settings.gradle