Merge remote-tracking branch 'origin/pedroc/android_e2e_dev' into pedroc/android_e2e_dev

java/android/OlmLibSdk/README.rst

 OlmLibSdk
 =========
 
-OlmLibSdk exposes An android wrapper to libolm.
-
+OlmLibSdk exposes an android wrapper to libolm.
 
 Installation
 ------------
-	Create a libs directory in your project directory
-	Copy the olm-sdk.aar into it.
-	In your build.gradle file, add in the android section
-    	repositories {
-       		flatDir {
-             	 dir 'libs'
-          	}
-      	}
-	Add in the dependencies category		 
-		compile(name: 'olm-sdk', ext: 'aar')
+Create a libs directory in your project directory
+Copy the olm-sdk.aar into it.
+
+In your build.gradle file, add in the android section::
+
+    repositories {
+        flatDir {
+            dir 'libs'
+        }
+    }
+
+Add in the dependencies category::
+
+    compile(name: 'olm-sdk', ext: 'aar')
 
 Development
 -----------
-import the project from the /java/android/OlmLibSdk path.
+import the project from the ``/java/android/OlmLibSdk`` path.
 
 The project contains some JNI files and some Java wraper files.
 
-The project contains some tests under AndroidTests package.
\ No newline at end of file
+The project contains some tests under AndroidTests package.