paging bug done
Merge branch 'featurePaging' into testing