added stage environment
updated Gemfile.lock
use capistrano 3.3.5
added rails stage environment
added stage environment to secrets.yml
Resolve merge conflicts with master.