Enable media messages forwarding
Merge branch 'master1ff' into fast_forward

Conflicts:
	src/org/thoughtcrime/securesms/ConversationFragment.java