Add a message indicator for whisper messages
Add pictures of the sms type indicator
Rename messageTypeIndicator to smsTypeIndicator
Correct indent
Merge remote-tracking branch 'remotes/upstream/master' into msg_details_icon

Conflicts:
	src/org/thoughtcrime/securesms/ConversationItem.java
Update to latest zxing QR code scanner.

Closes #2078

// FREEBIE
Make GCM re-registration failure notification based.

// FREEBIE
merged  WhisperSystems/master
merged  origin/msg_details_icon