upgrade versions
fix test
fuck you
Merge commit '921632f'

Conflicts:
	pom.xml