Fix another #warning on win32
Remove btsx specific fork changes
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop

Conflicts:
	libraries/blockchain/market_engine.cpp
Merge branch 'develop' into btsx

Conflicts:
	libraries/blockchain/market_engine.cpp
	libraries/blockchain/market_operations.cpp