Merge branch 'dev-jsonfeed' into dev-dsw

Conflicts:
	deefuzzer/station.py

diff --cc deefuzzer/station.py
index abc10a0e60814e0f7aa6f13dc468c1cf859b3c96,b9b181096d3198e7f4d620697b3a167c27608ee8..ad8bbc5c57e1e652db89a87efe723761dcd35f45
--- 1/deefuzzer/station.py
--- 2/deefuzzer/station.py
+++ b/deefuzzer/station.py
@@@ -72,7 -72,8 +72,9 @@@ class Station(Thread)
      record_mode = 0
      run_mode = 1
      station_dir = None
 +    appendtype = 1
+     feed_json = 0
+     feed_rss = 1
  
      def __init__(self, station, q, logger, m3u):
          Thread.__init__(self)