Merge remote-tracking branch 'origin/master' into develop
Merge branch 'develop' of https://github.com/BitShares/web_wallet into develop
Merge remote-tracking branch 'origin/develop' into develop
fix collateral ratio required when executing short order in market rule summary page:
change from 3x to 2x 

https://bitsharestalk.org/index.php?topic=9587.0
Chinese translation update
Merge remote-tracking branch 'origin/develop' into develop
merge with upstream, fix conflict
Merge pull request #422 from AlexChien/chinese

Chinese Translation Update