Administrator Javascripts
Merge branch 'routes'