fix Gemfile.lock
Merge branch 'master' into development
update unicorn configs
finish capistrano setup