ugh
Merge branch 'master' of https://github.com/robotastic/smartnet-recorder

Conflicts:
	logging_receiver_dsd.cc