edge progress
Merge branch 'develop' of https://github.com/BitShares/bitshares into develop

Conflicts:
	libraries/blockchain/include/bts/blockchain/pending_chain_state.hpp
Merge branch 'develop' of https://github.com/BitShares/bitshares into develop