Unitsetup pagination issue resolved.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1635 from mitraj/dev-branch

Unitsetup pagination issue resolved.