Merge branch 'dev-jsonfeed' into dev-dsw

Conflicts:
	deefuzzer/station.py

diff --cc deefuzzer/station.py
index ad8bbc5c57e1e652db89a87efe723761dcd35f45,82f418b365e18a5d4a53fd84b4ed6a912b5ff04b..f1fec09839decffaa8797e52ce16f892009385d1
--- 1/deefuzzer/station.py
--- 2/deefuzzer/station.py
+++ b/deefuzzer/station.py
@@@ -72,9 -73,10 +73,11 @@@ class Station(Thread)
      record_mode = 0
      run_mode = 1
      station_dir = None
-     feed_json = 0
-     feed_rss = 1
 +    appendtype = 1
+     feeds_json = 0
+     feeds_rss = 1
+     feeds_mode = 1
+     feeds_playlist = 1
  
      def __init__(self, station, q, logger, m3u):
          Thread.__init__(self)

diff --cc example/deefuzzer.json
Simple merge

diff --cc example/deefuzzer.xml
Simple merge

diff --cc example/deefuzzer.yaml
Simple merge

diff --cc example/deefuzzer_doc.xml
Simple merge