production change
Merge remote-tracking branch 'origin/master'
For production
Merge remote-tracking branch 'origin/master'
New updates
Ajaxified file upload
Merge remote-tracking branch 'ta/master'

Conflicts:
	app/views/cross_clouds/_aws_form.html.erb