more
Merge branch 'master' of https://github.com/yajiedesign/CTPCSharp

Conflicts:
	CLR-CTP/CTPTradeApi.cpp