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

Conflicts:
	treasuryArbitrage/src/edu/nju/treasuryArbitrage/ui/futuresMarket/FuturesMarketChen.java