infrastructure for inline media

issue #1915
switch sides
eclipse format applied

issue #1915
Inline media icon / thumbnail for images

issue #1915
Merge branch 'upstream' into feature_inline_media

Conflicts:
	res/layout/new_message_item.xml
Thumbnail retrieval in async task

issue #1915
Forgot DB mime type column on create
do not refresh an incoming image thumbnail if not needed

issue #1915
Delivery confirm on media, cleanup

issue #1915
Merge branch 'upstream' into feature_inline_media

Conflicts:
	src/info/guardianproject/otr/OtrDataHandler.java
Merge branch 'devrandom-feature_inline_media'

Conflicts:
	src/info/guardianproject/otr/app/im/app/MessageView.java