Fix another #warning on win32
Bump version
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
Merge pull request #40 from vikramrajkumar/btsx

merge latest
Update submodules
Merge pull request #41 from vikramrajkumar/btsx

Update submodules
match upstream
Merge pull request #43 from vikramrajkumar/btsx

match upstream
Merge remote-tracking branch 'remotes/origin/master' into emfrias_master

Conflicts:
	libraries/blockchain/market_engine.cpp