Merge branch 'master' of https://github.com/jasonchenliang/XTrade.git