- #919: Menu item to send a sms
- #919: Menu item to send a sms
Merge branch 'send_sms' of github.com:Hellmy/TextSecure into send_sms
Merged mcginty sent-sms changes and updated to master

Merge remote-tracking branch 'remotes/upstream/master' into send_sms

Conflicts:
	src/org/thoughtcrime/securesms/database/model/MessageRecord.java
Merge remote-tracking branch 'remotes/upstream/master' into send_sms
- "Send unencrypted" forces a unencrypted sms
- Rename menu_context_item to indicate sending/forcing a sms
Merge branch 'send_sms' into my_version