Admin changes
Merge pull request #10 from athahar/develop

Pull from main
Merge pull request #62 from mevashi/develop

Admin changes