Automatically show keyboard when new SMS is composed
Automatically show keyboard when new SMS is composed
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/thoughtcrime/securesms/ConversationActivity.java
Automatically show keyboard when new SMS is composed