master deploy
production asset
deploy setting
deploy
Merge branch 'web_feature'

Conflicts:
	config/deploy.rb