pagination now working; fixed activate user bug
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team3_v2.4
Merge pull request #202 from BuracayBeach/team3_v2.4

Team3 v2.4