added ability to support old and new market engine
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop