[market] adding support for advanced / basic views, confilct resolve

Conflicts:
	app/js/controllers/market.coffee
	app/templates/market/market.html