paginator
merging
merging
Merge branch 'develop' of https://github.com/cmgranados/simplicity into develop
change to paginator