Fix modal "ok" button reload page
Merge remote-tracking branch 'rt/master'

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