Update the routes to follow adminhtml
Merge remote-tracking branch 'origin/hackathon' into hackathon