fix sharedrop substitutions
Merge branch 'develop' of https://github.com/BitShares/bitshares into develop

Conflicts:
	libraries/blockchain/genesis.json