add explicit postgresql dependency
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	pom.xml