modifications in admin
Merge branch 'admin_pradeep'