authentication in admin
Merge branch 'aritrik'