Upgrade libraries

Conflicts:
	pom.xml
Merge pull request #1023 from emmanuel-keller/1.6

Upgrade libraries