bump versions
Merge branch 'master' into poemspace

Conflicts:
	pom.xml