changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/angular/templates/widgets/pernode/show.html.erb
Fix ssh_keys for all clouds
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/views/cloud_settings/_sshkey_index.html.erb