rollback to appcompat v20

v21 appears to just not be ready for production given the bugs.
// FREEBIE
Don't completely disable GCM.

// FREEBIE
Updated translations.

// FREEBIE
Bump version to 2.3.1

// FREEBIE
merged  WhisperSystems/master