more progress on trading platform
Merge branch 'master' of github.com:jinpan/traders

Conflicts:
	API/API