Capistrano 3.1
Add js as a respond format
Merge ../x0y0

Conflicts:
	config/deploy/production.rb