XBTC priority over XCP
read in counterwallet config
get escrowed balances
configurable assets_to_asset_pair
fix same price orders merging
Merge pull request #45 from CounterpartyXCP/develop

1.5.0 PRE2
armory: forgotten import
Merge pull request #46 from CounterpartyXCP/develop

armory: forgotten import
use only completed order_matches to calculate 24h volume
round up/down sell/buy orders
clean previous commit
fix volume in market list
fix previous commit
configurable quotation assets also for market list
Merge pull request #47 from CounterpartyXCP/develop

Develop
Merge remote-tracking branch 'upstream/master'

Conflicts merged in:
	clearblockd.py
	lib/util.py