Update dependencies

Conflicts:
	pom.xml
Merge pull request #1129 from emmanuel-keller/master

Update dependencies