Upgrade libraries

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

Upgrade libraries