fixed merge error
fixed double decoder of RTTY, thanks DR
added back 600 and 1200 to gui
modified fftfilt.cxx and removed additional rtty filter - was stopping 150baud + from decoding. WARNING this is a dirty hack - will need review upstream to actually fix the problem - difficult to know what the damage is by getting it to work
added if clause to allow new filter code to be used if baud <= 100, if higher then no filter - this allows higher baud rates to be usable in dl-fldigi
Merge remote-tracking branch 'upstream/master'

Conflicts:
	po/dl-fldigi.pot