market view
Merge branch 'master' of git://github.com/surbitcoin/exchange into surbitcoin-master

Conflicts:
	assets/js/bitex_app_blink_trade.compiled.en_US.ander.js
	assets/js/bitex_app_blink_trade.compiled.en_US.default.js
	assets/js/bitex_app_blink_trade.compiled.es.ander.js
	assets/js/bitex_app_blink_trade.compiled.es.default.js
	assets/js/bitex_app_blink_trade.compiled.pt_BR.ander.js
	assets/js/bitex_app_blink_trade.compiled.pt_BR.default.js
Merge branch 'surbitcoin-master'