Fix bugs in search
Merge
Preparing for paging search
Pagination for search
fix merge conflicts
fix merge conflicts
fix all conflicts
paginations for search and categories
Fix small bugs
Merge branch 'master' of https://github.com/nromanen/Ch-025 into shutka