Merge branch 'master' of https://github.com/juanmb/opendaq

Conflicts:
	encoder.cpp
	odstream.cpp
Merge branch 'master' of https://github.com/juanmb/opendaq