Pagination link fixed
schema updates
Merge branch 'master' into production