css fix
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	app/helpers/cross_clouds_helper.rb
Merge pull request #213 from thomasalrin/0.5

0.5