Re-indent and put deprecated notice in couple lines
J2.5 it's missing the setting to choose the re-size method
Insert simple link isntead tweeet when activity integration is enabled
Replace calls KunenaAttachmentHelper::shortenFileName by getShortName
Fixes:
 - Add profiles positions
 - Fix html
Merge pull request #2624 from xillibit/k31_bugs16

J2.5 it's missing the setting to choose the re-size method
Avatar Resize Method (Best - Slower) generates a fatal error #2633
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
Merge pull request #2634 from 810/develop-html-9-9

[develop][3.1.0] Fix html 9-9
Merge pull request #2618 from xillibit/kdev-patch-6

Re-indent and put deprecated notice in couple lines
[K3.1] Editor: IE Object doesn't support this action #2646
Merge pull request #2650 from xillibit/k31_bugs16

[K3.1] Editor: IE Object doesn't support this action #2646
Fix for displaying correctly the email link in the user profile
Merge pull request #2651 from xillibit/k31_bugs16

Fix for displaying correctly the email link in the user profile
[develop][3.1.0]: Lightbox - Displaying 7 instead short name #2608
Merge pull request #2640 from xillibit/kdev-patch-5

Avatar Resize Method (Best - Slower) generates a fatal error #2633
Merge pull request #2655 from xillibit/kdev-patch-4

[develop][3.1.0]: Lightbox - Displaying 7 instead short name #2608