...
Merge branch 'master' of https://github.com/hmatuschek/sdr-rx

Conflicts:
	src/demodulator.cc
Fixed FMDemod etc...