Fix s3 upload files
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/controllers/cross_clouds_controller.rb
	app/views/cross_clouds/new.html.erb
Minor tweak to title, add doc link in cloud store, TBD to tbd in pricing