#1239 Avatar Upload: Wrong error message
Merge remote-tracking branch 'upstream/master' into bugs9
Add option in tools to clean adresses IP (update)
Merge remote branch 'xillibit/bugs9' into merges
Minor modifications to #1239 Avatar Upload: Wrong error message
Merge remote branch 'xillibit/k30_bugs16' into merges

Conflicts:
	administrator/components/com_kunena/language/en-GB/en-GB.com_kunena.controllers.ini
Fix missing translations
Merge pull request #1561 from mahagr/merges

Merge pulls #1514 and #1544, fix language issues