Merge branch 'dev-jsonfeed' into dev-dsw

Conflicts:
	deefuzzer/station.py
Merge branch 'dev-jsonfeed' into dev-dsw

Conflicts:
	deefuzzer/station.py
Merge pull request #28 from achbed/dev-dsw

JSON Feed Support