Updated/Readded stuttgart
Merge branch 'master' of https://github.com/areyer/directory.api.freifunk.net into areyer-master

Conflicts:
	directory.json
Merge branch 'areyer-master'