change out key cached icon to be more unique

Fixes #651
// FREEBIE
Merge pull request #1495 from mcginty/icon-cached

change out key cached icon to be more unique
don't call replace() on null formattedNumber

Fixes #1397
// FREEBIE
sanely handle duplicate contacts in db

// FREEBIE
Change draw selector to background
Fix AlertDialog Background on Android 2.3
new passphrase prompt activity
// FREEBIE
Reactivate a group if a contact gets readded

Fixes #723 //FREEBIE

Removes the own number from group on leaving, to receive a proper
re-added message
Finish activity before restarting it

The current activity needs to be finished before calling startActivity.
Otherwise, activities with launchMode singleTask (ConversationListActivity)
will receive a new Intent instead of getting restarted. And in response
to the new Intent, they will run onResume once again and trigger a second restart.

Fixes #1292
Merge remote-tracking branch 'upstream/master'