version bump to 2.8.4-beta

Merge branch 'api-level-18' of https://github.com/deuill/Conversations into deuill-api-level-18

Checkout `xmpp-addr` library 0.8.0 (fa47cac8) locally

Changes to this library will be implemented as additional commits.

EnhancedListView deleted from settings.gradle (#2947)

integrate trust manager into conversations

Gradle Update to 3.0.1 with aapt

Gradle Update to 3.0.1 with aapt

Gradle Update to 3.0.1 with aapt fix try

Merge pull request #1558 from fiaxh/pgp_api_9.0

Use OpenPGP-API 9.0

Use OpenPGP-API 9.0

Merge pull request #949 from kruks23/title_activity

Remove title_activity_conversations and use app_name instead

Remove title_activity_conversations and use app_name instead

disabled proguard. fixed gradle libs

Merge pull request #600 from SamWhited/gradle

Build system and library changes (Gradle / Subtree merging)

Merge branch 'gradle' into development

Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib

Set the root project name

Remove useless include from Gradle settings

Move submodules back to libs/

Use Gradle build system