fix send icon merge botch, encryption icons logic
// FREEBIE
Add null check. // FREEBIE
remove lock coloring in send icons
// FREEBIE
Merge pull request #1288 from mcginty/send-icons-redux-redux

remove lock coloring in send icons
Updated language translations.
// FREEBIE
Bumping version to 2.0.6

// FREEBIE
Stop recycled bitmap crashes
Fixes #792
Merge pull request #1297 from McLoo/master

Stop recycled bitmap crashes
Display send date for incoming messages

Fixes #597.
Fix issue with weird exiting animation from conversation

Fixes #1312
// FREEBIE
Add a TrustManager that blacklists via serial numbers.
mark auto-fallback to sms as forcedSms
// FREEBIE
group and contact list fixes

1) Updating a group without changing the avatar will keep that
   avatar

2) Prohibit adding non-push users to an existing push group

3) Add Android contacts to the same database. Takes a small amount
   more time and memory, but allows queries to not be a hack, and
   enables us to dedupe numbers in JB and higher devices.

// FREEBIE
Use backwards-compatible attempt to write SharedPreferences in an asynchronous way