enable fresh deploy
remove extra comments
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/config_file/server.json
	config/deploy.rb
	config/deploy/testing.rb