merge origin/master
merge origin/master

bitshares/web_wallet,zhangweis/dice_web,dacsunlimited/web_play,bitshares/web_wallet,dacsunlimited/web_play,bitsuperlab/web_play,bitsuperlab/web_play,dacsunlimited/web_play,bitsuperlab/web_play