Merge branch 'release/1.0.0'

Conflicts:
	app/src/main/res/xml/preference_editor.xml

Author: Grigory Fedorov

.gitignore

@@ -5,3 +5,4 @@ build
 .gradle
 *.apk
 app/manifest-merger-release-report.txt
+*~*

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "app/otr4j"]
+	path = app/otr4j
+	url = https://github.com/otr4j/otr4j.git

README.rst

@@ -27,6 +27,7 @@ Supported protocols
 * XEP-0059: Result Set Management
 * XEP-0136: Message Archiving
 * XEP-0224: Attention
+* XEP-0077: In-Band Registration
 
 Translations
 ============

app/build.gradle

@@ -1,23 +1,33 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 9
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
         applicationId "com.xabber.androiddev"
-        minSdkVersion 3
-        targetSdkVersion 9
+        minSdkVersion 14
+        targetSdkVersion 22
+        versionCode 172
+        versionName '1.0.0'
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
 }
 
+repositories {
+    mavenCentral()
+}
+
 dependencies {
-    compile files('libs/otr4j.jar')
+    compile 'com.android.support:appcompat-v7:22.1.0'
+    compile 'com.android.support:support-v13:22.0.0'
+    compile 'com.github.ksoichiro:android-observablescrollview:1.5.0'
+    compile 'de.hdodenhof:circleimageview:1.2.2'
+    compile 'com.melnykov:floatingactionbutton:1.2.0'
+    compile 'dnsjava:dnsjava:2.1.7'
+    compile project('otr4j')
 }