commit log/development to go to master
Merge branch 'admin-side-task'
Manually Updated all Changes from Admin-Side_Task