final version
Merge branch 'master' of https://github.com/spacemonkeydelivers/stream_parser

Conflicts:
	stream_parser_new.cpp