Update gems
Add capistrano and related gems
Update Gemfile.lock
Merge branch 'develop'