update deploy script
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/deploy.rb
register in admin