Added rdid match for server-->router handler
Merge branch 'master' of github.com:squidpie/sansgrid