changes to newer versions to avoid weird runtime errors
upgrade versions
fix test
fuck you
Merge commit '921632f'

Conflicts:
	pom.xml
Merge pull request #81 from minom/master

update dependencies and small test fixes