worked on admin settings page
Merge origin/master