merge commit
Merge branch 'master' of github.com:kingofhawks/stocktrace

Conflicts:
	src/stocktrace/parse/ifengparser.pyc
	src/stocktrace/parse/sseparser.pyc