updated config
staging deploy added
Merge branch 'refs/heads/feature' into staging
staging test
Merge remote-tracking branch 'origin/staging'