ui issues
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

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