Changes in the routing system & some fixes
Merge branch 'dreamvids-2.0-dev' of github.com:DreamVids/DreamVids into dreamvids-2.0-dev