[bug fix] swift setup file syntax error
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/recipes/swift_setup.rb
[feature] add fresh deploy task
fix merge conflicts:server.json ruby_setup.rb swift_setup.rb