update
Merge remote-tracking branch 'origin/master'

Conflicts:
	tradingdesk/trading_check.py
	yeahmobi/datacollector.py