Hopefully fix incorrect prices in order book
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop

Conflicts:
	libraries/cli/cli.cpp