Change-Id: I8ede039183e57b1ee2e6f115dccbbf2422140772
Merge branch 'master' of https://github.com:443/longzeyi/Test.git

Conflicts:
	src/sz/future/trader/console/MyTraderSpi.java
Merge branch 'master' of https://github.com:443/longzeyi/Test.git

Conflicts:
	TradingDay.con