commit for pull
resolved merge conflict
I have optimized querries and paginate on a couple of pages
Merge pull request #72 from scalableinternetservices/optimizing

Optimized some querries as well as paginate on a couple of pages
merge