[GS] Regression tests - wallet_market_submit_short
Merge branch 'develop' of https://github.com/BitShares/bitshares_toolkit into develop
[GS] Regression tests - wallet_market_submit_short, delete failing test
[GS] Update regression tests
[GS] Regression tests - wallet_market_cancel_order
Update qt_wallet submodule
Fix stupid error that was causing blockchain code to be executed in the p2p thread (Fixes #793)
fix for margin calls
Market engine fixes
Market engine fixes

Conflicts:
	libraries/blockchain/chain_database.cpp
	libraries/blockchain/market_engine_v2.cpp
	libraries/blockchain/market_engine_v3.cpp
	libraries/blockchain/market_operations_v1.cpp
Merge branch 'develop' into market
Update submodules
Merge branch 'develop' into btsx

Conflicts:
	programs/qt_wallet
	programs/web_wallet
Track read/write network usage separately
If there's a high-level error opening the chain database (like wrong chain id), try to recover the database from outside the catch block, to avoid a thread yield which would lead to a crash.  May also be related to #790
Update submodules
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop
Merge branch 'develop' into btsx
Merge pull request #62 from vikramrajkumar/btsx

Merge upstream