Replaced Zend paginator with Pagerfanta
Fix merge conflicts