pattabhi-modified views
pattabhi-resolved conflicts
Merge branch 'master' of github.com:amzurtechnologies/ITKnowledgeTransfer
pattabhi - resolved conflicts
pattabhi- added pagination to all categories and users controller
Merge branch 'master' of github.com:amzurtechnologies/ITKnowledgeTransfer