fixed import errors
Merge branch 'master' into admin-auth