Merge.
Merge branch 'master' of https://github.com/hmatuschek/libsdr

Conflicts:
	src/gui/waterfallview.cc