fix deploy for project made with app_templates
fix echo
fix link
Merge branch 'noscript' into app_templates

Conflicts:
	lib/auth-deploy/capistrano.rb
Merge branch 'noscript' into app_templates