check and admin and authenticated
Merge branch 'master' into products