fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/deploy/shared/nginx.conf.erb