changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/angular/templates/widgets/pernode/show.html.erb
A busy tracker for the log stream messages
Merge remote-tracking branch 'ta/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
Fix ssh_keys for all clouds
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
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/views/cloud_settings/_sshkey_index.html.erb
Fix split cloud_settings controller(ssh_key, cloud_tool_settings) and ssh_key page
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/views/cloud_settings/_sshkey_index.html.erb
test
Merge remote-tracking branch 'origin/master'
new for demo