Added postgresql module
Merge branch 'master' into gitlab-test

Conflicts:
	Puppetfile