proper adapter... change everything to postgres
Merge branch 'master' into production