4.24,  回归capistrano 2.x.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Capfile
	Gemfile
	Gemfile.lock
	config/deploy.rb
4.24-2