Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/unicorn.login.css
	app/views/cloud_settings/_sshkey_index.html.erb
	app/views/sessions/new.html.erb
	app/views/users/new.html.erb
cloud_dashboard index fix
Merge remote-tracking branch 'ta/master'

Conflicts:
	app/assets/stylesheets/unicorn.login.css
	app/views/cloud_settings/_sshkey_index.html.erb
	app/views/users/new.html.erb