production change
Merge remote-tracking branch 'origin/master'
For production
Merge remote-tracking branch 'origin/master'
New updates
Modified the team page, added rad.
Ajaxified file upload
Merge remote-tracking branch 'rt/master'
Merge remote-tracking branch 'ta/master'

Conflicts:
	app/views/cross_clouds/_aws_form.html.erb
Merge remote-tracking branch 'origin' into bootstrap3

Conflicts:
	app/views/cross_clouds/new.html.erb
	app/views/pages/about.html.erb