better admin url
Merge branch 'master' into deploy