Merge pull request #6 from mojoaxel/master

Freifunk Franken added
ffmap: try another encoding, if reading utf8 fails
ffmap: build absolute links, added missing items. caution: images don't exist at all right now
Merge branch 'master' of github.com:freifunk/api.freifunk.net
ffmap: reworked circles
added kbu
Add augsburg
Add Wahlsdorf
ffmap: add own icon set
ffmap: typos
api: added google plus to contacts, working on #7
ffmap: added missing items
ffmap: get a non-clickable map, instead redirect to another page
add a small python script to update the number of olsr nodes in the ffapi-json
file
Merge branch 'master' of github.com:freifunk/api.freifunk.net
ffmap: smarter popups
added dresden
Added Kiel
Merge pull request #9 from T-X/master

Added Kiel
Leipzig, Leisnig, Gadow, Zootzen, Battlemesh und Großdraxdorf hinzugefügt