J2.5 it's missing the setting to choose the re-size method
Replace calls KunenaAttachmentHelper::shortenFileName by getShortName
Merge pull request #2624 from xillibit/k31_bugs16

J2.5 it's missing the setting to choose the re-size method
Merge pull request #2632 from xillibit/kdev-patch-4

Replace calls KunenaAttachmentHelper::shortenFileName by getShortName
[K3.1 develop]Notice: Object of class KunenaForumMessage on send email
#2643
Merge pull request #2644 from xillibit/k31_bugs16

[K3.1 develop]Notice: Object of class KunenaForumMessage on send email
Merge remote-tracking branch 'upstream/develop' into develop-html-9-9

Conflicts:
	components/com_kunena/site/template/crypsis/layouts/attachment/item/textlink.php