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

Conflicts:
	app/js/controllers/market.coffee
	app/templates/market/market.html
Merge branch 'marketmodes' of https://github.com/BitShares/web_wallet into marketmodes

Conflicts:
	app/js/controllers/market.coffee
	app/templates/market/market.html
cover_order was renamed to margin_order
[markets] fixed scope, moved the advanced button into the header
persisting advanced market display selection toggle
merged develop branch
orders_table animate and collat ratio calc
Merge branch 'marketmodes' of https://github.com/BitShares/web_wallet into marketmodes

Conflicts:
	app/js/controllers/market.coffee
fix for price feed on depth chart
[market] separate tables for open orders {buy,sell,margin,short}
Merge branch 'marketmodes' of https://github.com/BitShares/web_wallet into marketmodes
In the buy,sell,short tabs all fees should be in the base_symbol
[market] adjusted tx fee tooltip for the buy,sell,short tabs
[market] simple / advanced view text w/change to checkbox
updated market page's layout
[market] ordered all columns qty,price,total
Merge branch 'marketmodes' of https://github.com/BitShares/web_wallet into marketmodes
alligns order book and shorts collat chart
2x2 view of open orders
Merge branch 'marketmodes' of https://github.com/BitShares/web_wallet into marketmodes