Merge pull request vnpy#187 from vnpy/dev

修复合并错误

Merge pull request vnpy#173 from vnpy/dev

v1.2发布

Merge pull request vnpy#123 from vnpy/dev

Dev

Merge pull request vnpy#86 from vnpy/dev

增加ATR-RSI策略