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

Conflicts:
	app/controllers/marketplaces_controller.rb
	app/views/marketplaces/index.html.erb
	app/views/marketplaces/show.html.erb
	app/views/users/edit.html.erb
settings creation
Merge pull request #117 from rajthilakmca/0.5

Fix marketplace ui and create app
Merge pull request #118 from thomasalrin/0.5

settings creation
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	app/assets/images/1.png
	app/assets/images/2.png
	app/assets/images/4.png
	app/assets/images/5.png
	app/assets/images/6.png
	app/assets/images/amazon.png
	app/assets/images/clouds/1.png
	app/assets/images/clouds/2.png
	app/assets/images/clouds/3.png
	app/assets/images/clouds/4.png
	app/assets/images/clouds/5.png
	app/assets/images/clouds/6.png
	app/assets/images/gce.png
	app/assets/images/gogrid.png
	app/assets/images/hp.png
	app/assets/images/opennebula.png
	app/assets/images/profitbricks.png
	app/assets/stylesheets/custom.css
	app/assets/stylesheets/style.css
	app/views/main_dashboards/index.html.erb
	app/views/settings/index.html.erb