cross-cloud start
Merge branch '0.5' of https://github.com/thomasalrin/nilavu into thomasalrin-0.5

Conflicts:
	app/views/ssh_keys/_sshkeys.html.erb
Merge branch 'thomasalrin-0.5' into 0.5
Merge remote-tracking branch 'origin/0.5' into 0.5