modified retrieveCategories query
modified queries in changeuserRoles
Merge branch 'master' of https://github.com/bbokka/PHPProject4
Merge branch 'changeUserRoles-Vaidehi'