rollback jxmods.
Merge branch 'master' of https://github.com/WhisperSystems/TextSecure
Fixes "subtitle is not updated when select all is pressed"

// FREEBIE
add custom phone number type
Always show the time of the received message.
Merge remote-tracking branch 'upstream/master'
upgrades.