cc
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile.lock
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile
	Gemfile.lock
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile.lock
update the new ui
Merge pull request #209 from thomasalrin/0.5

hp list images
Merge pull request #210 from rajthilakmca/0.5

Update the new ui
Fixed error
Merge pull request #211 from rajthilakmca/0.5

Fixed error
Fix precompile error
Merge pull request #212 from rajthilakmca/0.5

Fix precompile error
css fix
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	app/helpers/cross_clouds_helper.rb