Added client and serverside pagination
Merge branch 'master' of https://github.com/WPFerg/scratch-app