Add launch and attach button's
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/controllers/market_places_controller.rb
	app/views/market_places/_category_view_form.html.erb
	app/views/market_places/market_place_app_show.html.erb
fix to make sshkeys load when no keys exists, alignment marketplace