K30/J25 Backend: Pagination consistency between J30 and J25.
Merge remote branch 'coder4life/kunena30-joomla25-bugs1' into merges
Administrator: Implement new layout based pagination
Fix minor regression in pagination
Merge remote branch 'upstream/master' into merges

Conflicts:
	administrator/components/com_kunena/template/joomla25/categories/default.php
Merge pull request #1559 from mahagr/merges

Administrator: Implement new layout based pagination