merged with master

...java/org/briarproject/sync/SimplexMessagingComponent.java

...rg/briarproject/sync/SimplexMessagingIntegrationTest.java

briar-android/res/values/roboguice.xml

...ndroid/src/org/briarproject/android/AndroidComponent.java

...r-core/src/org/briarproject/clients/ClientHelperImpl.java

briar-core/src/org/briarproject/clients/ClientsModule.java

...core/src/org/briarproject/contact/ContactManagerImpl.java

briar-core/src/org/briarproject/contact/ContactModule.java

briar-core/src/org/briarproject/forum/ForumModule.java

...e/src/org/briarproject/forum/ForumSharingManagerImpl.java

...re/src/org/briarproject/identity/IdentityManagerImpl.java

briar-core/src/org/briarproject/identity/IdentityModule.java

...ore/src/org/briarproject/invitation/InvitationModule.java

briar-core/src/org/briarproject/plugins/PluginsModule.java

briar-core/src/org/briarproject/sync/SyncModule.java