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
bug fix and layout tweak for inline image
add audio playback for inline media
show audio icon and play audio directly in app
Show verified status with media icon

issue #1915
Merge remote-tracking branch 'upstream/master' into feature_inline_media
More HockeyApp telemetry for service start/stop

issue #2695
More timestamps (boot, previous)

issue #2695
Merge pull request #366 from devrandom/feature_telemetry

Service telemetry - record timestamps
fix for bug #2722 AccountActivity crash