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
Merge pull request #117 from rajthilakmca/0.5

Fix marketplace ui and create app