Admin model changed for Admin directory
Merge branch 'master' of https://github.com/koommerce/catalog