Merge branch 'dev-stationfolder' into dev

Conflicts:
	deefuzzer/core.py
	deefuzzer/tools/utils.py

diff --cc example/deefuzzer.json
index 2234dedbd168b06bd435d2a2d4e95e32a0d484cf,add4b6e1901d964efb4e24e57c7b47b3e34c8d4f..7f53f8629dbe0e51ec2d390ee32f76e8231a6dfa
--- 1/example/deefuzzer.json
--- 2/example/deefuzzer.json
+++ b/example/deefuzzer.json
@@@ -2,13 -2,13 +2,24 @@@
      "deefuzzer": {
          "log": "/path/to/station.log",
          "m3u": "/path/to/station.m3u",
+         "stationdefaults": {
+             "control": {
+                 "mode": 0,
+                 "port": 16001
+             },
+             "jingles": {
+                 "dir": "/path/to/jingles",
++                "mode": 0,
++                "shuffle": 1
++            }
++        },
 +        "station": {
 +            "control": {
 +                "mode": 0,
 +                "port": 16001
 +            },
 +            "jingles": {
 +                "dir": "/path/to/jingles",
                  "mode": 0,
                  "shuffle": 1
              }