UPD on 25-1
Merge remote-tracking branch 'origin'

Conflicts:
	app/assets/javascripts/unicorn.dashboard.js
	app/views/cloud_identities/show.html.erb
push 25-1
Merge remote-tracking branch 'ta/master'

Conflicts:
	app/assets/javascripts/unicorn.dashboard.js
	app/views/cloud_identities/_setup_identity.html.erb