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