Adding pagination stuff & removing errors and warnings if there aren't any.
Merge branch 'develop'