Merge branch 'Upstream_master' into Upstream_release
Merge branch 'Upstream_release' into Upstream_develop
Merge branch 'Upstream_master' into Upstream_release
Merge branch 'Upstream_release' into Upstream_develop
Update develop to 1.4.0
Fix issue #379 where text for autolink is null.
Fix for #380 handle activity being null.
Fix for #382 handle an out of memory being caught
Fix for 383 handle type being null
Fix for #376
Fix for #374 - VolScroll defaulted to off
Fix for #371 change to add option to use display URLs rather than full URLs (default to full)
Updated changelog for #371 change
Merge pull request #384 from BlythMeister/BetaVersion

1.4.0 First Drop of fixes
Fix for #239 added auto complete mid status
Fix for #312 & #6 Larger and no inline image previews
Update change log
Merge pull request #385 from BlythMeister/BetaVersion

Autocomplete & image previews
Change layout as put conversation arrow in the wrong place
Add padding to large image preview