- #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 commit '3c0a910f3f0e13937680433dd6f5b1c119dc094d' into send_sms-test11