fixed route for admin page
Merge branch 'daltonbranch' into dev
Merge branch 'devDan' into dev