#1239 Avatar Upload: Wrong error message
#1332 K3.0 Batch process on users manager to affect moderators
 #1332 K3.0 Batch process on users manager to affect moderators
K30/J25 Backend: Pagination consistency between J30 and J25.
Merge remote branch 'coder4life/kunena30-joomla25-bugs1' into merges
update branch by fixing conflict
Merge remote-tracking branch 'upstream/master' into bugs9
Add option in tools to clean adresses IP (update)
#1542 Crypsis Profile: All users are displayed as admin
Kunena30/Joomla25 Backend: Fixed some design inconsistency that was introduced.
Crypsis : missing some buttons on messages action
Merge pull request #1556 from xillibit/k30_bugs8

#1542 Crypsis Profile: All users are displayed as admin
Merge pull request #1558 from xillibit/k30_bugs14

Crypsis : missing some buttons on messages action
Merge pull request #1557 from coder4life/kunena30-joomla25-bugs2

Kunena30/Joomla25 Backend: Fixed some design inconsistency,
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
Merge remote branch 'xillibit/k30_batch_moderators' into merges

Conflicts:
	administrator/components/com_kunena/language/en-GB/en-GB.com_kunena.controllers.ini
Fix and improve #1332: batch process moderators