data: auto negotiate OTR and resend requests on OTR activated

still issue with auto negotiate
data: make offers retry after OTR negotiation

fixes #2035
Fix content resolver not accessible during background task

fixes #2384
delay resolving intent until chats retrieved

fixes #2379
Init actionbar navigation
Merge branch 'fixes' of https://github.com/devrandom/ChatSecureAndroid into devrandom-fixes
Merge branch 'otr6' of https://github.com/devrandom/ChatSecureAndroid into devrandom-otr6
Merge branch 'upstream' into feature_inline_media

Conflicts:
	src/info/guardianproject/otr/OtrDataHandler.java