Fix #605
Libraries update

Conflicts:
	pom.xml
Libraries upgrade
Merge pull request #607 from emmanuel-keller/1.6

Bug fixes and libraries upgrades