merge
Merge remote-tracking branch 'origin/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
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/market_places/_category_view_form.html.erb
	app/views/market_places/market_place_app_show.html.erb
Fix market_place addon page
indicate if the app is up or down using an image.
Merge remote-tracking branch 'rt/master'