v2
Merge branch 'master' of github.com:hqjma/cap

Conflicts:
	capistrano.md
	config/deploy.rb
	config/deploy/staging.rb
modify
11