merge from bitshares

merge from bitshares