Merge pull request #22 from meskal/reworkFeeds

Rework feeds
Merge pull request #1 from FreifunkFranken/master

Merge pull request #22 from meskal/reworkFeeds