add Capfile
Merge remote-tracking branch 'origin/production' into staging