Merge pull request #16 from freifunk-ffm/master

Added Frankfurt am Main
Merge branch 'master' into refactoring
New Default Feed: http://freifunkstattangst.de/feed/
added Oldenburg
Merge pull request #18 from bjo81/master

added Oldenburg
Ulm added
nrw added
verweis auf blog
Update directory.json
fffeed: enabled itunes feeds and added freifunk radio
Merge branch 'master' of github.com:freifunk/api.freifunk.net
todo: cache mode
add www icon to popup, solves #25, thanks to Alexander Schmidt, Freifunk Franken
ffmap: updated www icon
ffmap: bugfix in popups
collector: moved to its own app, working on #21
fffeed: reduce php warnings
code cleanup / reformatted
completely refactored code.
added method for taking existing JSON into form.
missing class fixed