more changes, possibly conflicting
Merge branch 'master' of https://github.com/xoba/goutil

Conflicts:
	java/jdbc/driver.go
	java/jdbc/javasrc.go