Forgot to commit dispatcher.xml
Merge branch 'alvaro' into rhinomod
Deleted code incompatible with the changes but not important for the demo