Merge remote-tracking branch 'origin/develop' into real-data. Fix contacts synchronization.

# Conflicts:
#	.re-natal
#	android/app/build.gradle
#	android/app/src/main/java/com/statusim/MainActivity.java
#	android/settings.gradle
#	src/status_im/chat/handlers.cljs
#	src/status_im/chat/screen.cljs
#	src/status_im/chats_list/views/chat_list_item.cljs
#	src/status_im/db.cljs
#	src/status_im/group_settings/screen.cljs


Former-commit-id: dcc607022f
This commit is contained in:
virvar
2016-05-24 11:08:54 +03:00
77 changed files with 835 additions and 642 deletions
@@ -10,6 +10,7 @@ import android.os.Bundle;
import android.os.Environment;
import com.github.ethereum.go_ethereum.cmd.Geth;
import com.bitgo.randombytes.RandomBytesPackage;
import com.BV.LinearGradient.LinearGradientPackage;
import com.centaurwarchief.smslistener.SmsListener;
import java.util.Arrays;
@@ -80,6 +81,7 @@ public class MainActivity extends ReactActivity {
new ReactNativeContacts(),
new ReactNativeI18n(),
new RandomBytesPackage(),
new LinearGradientPackage(),
new SmsListener(this)
);
}