Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	omegatypes/src/main/java/com/omega_r/libs/omegatypes/TextStyle.kt

Author: AndroidLiba

omegatypes/src/main/java/com/omega_r/libs/omegatypes/TextBuilder.kt

@@ -2,12 +2,13 @@ package com.omega_r.libs.omegatypes
 
 import android.content.Context
 import android.content.res.Resources
+import java.io.Serializable
 
 /**
  * Created by Anton Knyazev on 29.03.2019.
  */
 private const val DEFAULT_CAPACITY = 10
-class TextBuilder(capacity: Int) {
+class TextBuilder(capacity: Int) : Serializable {
 
     private val list: MutableList<Text> = ArrayList(capacity)
 

omegatypes/src/main/java/com/omega_r/libs/omegatypes/TextStyle.kt

@@ -4,11 +4,14 @@ import android.content.Context
 import android.graphics.*
 import android.text.SpannableString
 import android.text.style.*
+import java.io.Serializable
+import android.text.style.ForegroundColorSpan
+import android.text.style.StyleSpan
 
 /**
  * Created by Anton Knyazev on 25.04.2019.
  */
-abstract class TextStyle {
+abstract class TextStyle : Serializable {
 
     companion object {