Merge from Remote:BitShares

Merge from Remote:BitShares