Fixed a bunch of router-->server, router-->radio
Merge branch 'master' of github.com:squidpie/sansgrid