fixed postgres issues
"merging for postgres"

Merge branch 'master' of https://github.com/speedracr/shopz