DeBug
Merge branch 'master' of https://github.com/HazelChen/treasuryArbitrage

Conflicts:

	treasuryArbitrage/src/edu/nju/treasuryArbitrage/logic/ctpbiz/CtpDataAdapter.java

	treasuryArbitrage/src/edu/nju/treasuryArbitrage/model/ctp/GetCtpData.java