Merge pull request #64 from vikramrajkumar/btsx

Merge upstream
Merge pull request #65 from vikramrajkumar/btsx

Remove now-extraneous assert
Merge pull request #66 from vikramrajkumar/btsx

Merge upstream
Rename wallet_get_info["transaction_scanning"] ->
"transaction_scanning_enabled"
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop
support for shorting assets backed by assets
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop

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

Conflicts:
	programs/qt_wallet
	programs/web_wallet
Prevent client from missing a block if it's advertised to it by a peer who then reports the block is not available when client requests it. We remove it from the inventory of the bad peer and add it back to our list of items_to_fetch if another peer has the block in its inventory. If we are synching with the bad peer, we also inhibit fetching further blocks from him (or disconnect him if he doesn't need blocks from us). Also added a little extra logging when we call disconnect_from_peer.
Address merge warning
Merge branch 'develop' into btsx
Update submodule