Enable all supported protocols including TLSv1.1 and 1.2
Fix problem when merging manifests
additonal safty net for disabling notifications
try all srv responses if necessary
made grace period on a per account basis
do not attempt to download images when not connected
Update README.md

Changed "little" to the grammatically correct "few", and corrected the spelling of "permissions".
Update strings.xml

French translation update
Update README.md
Remove support for legacy SSL
Set default preference ...

... for MUC notifications to true
Merge pull request #565 from the-solipsist/patch-2

Update README.md
Merge pull request #566 from BenoitBouvarel/patch-1

Update french strings.xml
Merge pull request #555 from SamWhited/build-fixes

Fix problem when merging manifests during a Gradle build
fixed typo in french translation
Merge branch 'srv_fix' of https://github.com/lactide/Conversations into lactide-srv_fix
Merge branch 'lactide-srv_fix' into development
force tls
Add "Enable legacy SSL" preference
Make legacy SSL option default to false