move Hamburg specific changes into master

Decided to move all changes for and from http://hamburg.freifunk.net/ into the `master`. Will keep the old state around in the `generic` branch.