Capistrano 3.1
Merge ../x0y0

Conflicts:
	config/deploy/production.rb