dep version cleanup
dep version cleanup
more pom cleanup
more pom cleanup
more pom cleanup
Merge branch 'master' into pom-cleanup

Conflicts:
	.gitignore