Merge branch 'aelmahmoudy-new_otr' into develop

app/build.gradle

 apply plugin: 'com.android.application'
 
-repositories {
-  mavenCentral()
-  mavenLocal()
-}
-
 android {
     compileSdkVersion 21
     buildToolsVersion "21.1.2"
@@ -17,12 +12,6 @@ android {
         versionName '0.10.21'
     }
 
-    sourceSets {
-        main {
-            java.srcDirs = ['src/main/java', 'otr4j/src/main/java']
-        }
-    }
-
     buildTypes {
         release {
             minifyEnabled false
@@ -38,5 +27,5 @@ android {
 dependencies {
     compile 'com.android.support:appcompat-v7:21.0.3'
     compile 'com.android.support:support-v13:21.0.3'
-    compile 'org.bouncycastle:bcprov-jdk15on:1.49'
+    compile project('otr4j')
 }

otr4j @ ab1d28e8

-Subproject commit 1811af26058c45aa0b67accd29ee278c80b02f0a
+Subproject commit ab1d28e8641238bcfd0ba11c0477da1d99f38a11

settings.gradle

 include ':app'
+include ':app:otr4j'