Made changes for the connection to POSTGRES
Merge remote-tracking branch 'origin/master'