Replace AdminHandler / Panel mishmash with the EditHandler API
Merge branch 'master' into edithandler