Merge remote-tracking branch 'upstream/master'
migrate nav panel items to actionbar

Fixes #1819
Closes #1839
// FREEBIE
improve some content descriptions

// FREEBIE
Merge pull request #1854 from mcginty/content-description

improve some content descriptions
apntool and ApnDatabase

// FREEBIE
Avoid leaking cursor.

// FREEBIE

Closes #1838
Updated language translations.

// FREEBIE
prevent another cursor leak

// FREEBIE
Merge pull request #1861 from mcginty/cursor-leak

prevent another cursor leak
disable localized collators in ApnDB

// FREEBIE
Merge pull request #1862 from mcginty/db-localization-ignore

disable localized collators in ApnDB
Bump version to 2.1.6

// FREEBIE
Merge branch 'master' of https://github.com/beljebuzz/TextSecure
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master' into jxmods