Merge branch 'release/0.1.9'
fix the java stuff
Merge branch 'hotfix/0.1.10' into develop

Conflicts:
	version.sbt