Merge branch 'eduard'
Pagination work (WIP).

Working on pagination. Commit before switching to "eduard" branch.
Merge branch 'master' into eduard