sorting issue fixed
Merge branch 'alpesh_dev'
general changes for admin panel