general changes for admin panel
Merge branch 'alpesh_dev'