Added .pgpass to .gitignore
Merge branches 'staging' and 'develop' into staging
Merge branches 'master' and 'staging'