From bfb88a658d1932decfe4de4c50852140d082b1d7 Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Sun, 20 Sep 2026 01:44:42 +0300 Subject: [PATCH] Upgrade dependencies --- app/build.gradle.kts | 11 + assets/licenses.html | 158 +- gradle/libs.versions.toml | 16 +- gradle/verification-metadata.xml | 4837 +++++++++++------------------- 4 files changed, 1886 insertions(+), 3136 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index da72ad560..1eda38514 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -159,6 +159,17 @@ android { unitTests { isIncludeAndroidResources = true all { unitTest -> + unitTest.jvmArgs( + "--add-opens=java.base/java.lang=ALL-UNNAMED", + "--add-opens=java.base/java.util=ALL-UNNAMED", + "--add-opens=java.base/java.io=ALL-UNNAMED", + "--add-opens=java.base/java.net=ALL-UNNAMED", + "--add-opens=java.base/java.security=ALL-UNNAMED", + "--add-opens=java.base/java.text=ALL-UNNAMED", + "--add-opens=java.base/jdk.internal.access=ALL-UNNAMED", + "--add-opens=java.desktop/java.awt.font=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED", + ) unitTest.extensions.configure(JacocoTaskExtension::class.java) { isIncludeNoLocationClasses = true excludes = listOf("jdk.internal.*") diff --git a/assets/licenses.html b/assets/licenses.html index d0b853afa..2df997edf 100644 --- a/assets/licenses.html +++ b/assets/licenses.html @@ -6238,7 +6238,7 @@
-Notice for coil (io.coil-kt.coil3:coil-android:3.6.0) +Notice for coil (io.coil-kt.coil3:coil-android:3.6.3)
 Source: https://github.com/coil-kt/coil
 
@@ -6320,7 +6320,7 @@
 
-Notice for coil-compose (io.coil-kt.coil3:coil-compose-android:3.6.0) +Notice for coil-compose (io.coil-kt.coil3:coil-compose-android:3.6.3)
 Source: https://github.com/coil-kt/coil
 
@@ -6402,7 +6402,7 @@
 
-Notice for coil-compose-core (io.coil-kt.coil3:coil-compose-core-android:3.6.0) +Notice for coil-compose-core (io.coil-kt.coil3:coil-compose-core-android:3.6.3)
 Source: https://github.com/coil-kt/coil
 
@@ -6484,7 +6484,7 @@
 
-Notice for coil-core (io.coil-kt.coil3:coil-core-android:3.6.0) +Notice for coil-core (io.coil-kt.coil3:coil-core-android:3.6.3)
 Source: https://github.com/coil-kt/coil
 
@@ -7116,7 +7116,7 @@
 
-Notice for com.googlecode.libphonenumber:libphonenumber:9.0.38 +Notice for com.googlecode.libphonenumber:libphonenumber:9.0.39
 Source: https://github.com/google/libphonenumber/
 
@@ -7280,9 +7280,9 @@
 
-Notice for Compose Animation (androidx.compose.animation:animation-android:1.12.0) +Notice for Compose Animation (androidx.compose.animation:animation-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-animation#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-animation#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -7362,9 +7362,9 @@
 
-Notice for Compose Animation (androidx.compose.animation:animation:1.12.0) +Notice for Compose Animation (androidx.compose.animation:animation:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-animation#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-animation#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -7608,9 +7608,9 @@
 
-Notice for Compose Animation Core (androidx.compose.animation:animation-core-android:1.12.0) +Notice for Compose Animation Core (androidx.compose.animation:animation-core-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-animation#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-animation#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -7690,9 +7690,9 @@
 
-Notice for Compose Animation Core (androidx.compose.animation:animation-core:1.12.0) +Notice for Compose Animation Core (androidx.compose.animation:animation-core:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-animation#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-animation#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -7936,9 +7936,9 @@
 
-Notice for Compose Foundation (androidx.compose.foundation:foundation-android:1.12.0) +Notice for Compose Foundation (androidx.compose.foundation:foundation-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -8018,9 +8018,9 @@
 
-Notice for Compose Foundation (androidx.compose.foundation:foundation:1.12.0) +Notice for Compose Foundation (androidx.compose.foundation:foundation:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -8264,9 +8264,9 @@
 
-Notice for Compose Geometry (androidx.compose.ui:ui-geometry-android:1.12.0) +Notice for Compose Geometry (androidx.compose.ui:ui-geometry-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -8346,9 +8346,9 @@
 
-Notice for Compose Geometry (androidx.compose.ui:ui-geometry:1.12.0) +Notice for Compose Geometry (androidx.compose.ui:ui-geometry:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -8592,9 +8592,9 @@
 
-Notice for Compose Graphics (androidx.compose.ui:ui-graphics-android:1.12.0) +Notice for Compose Graphics (androidx.compose.ui:ui-graphics-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -8674,9 +8674,9 @@
 
-Notice for Compose Graphics (androidx.compose.ui:ui-graphics:1.12.0) +Notice for Compose Graphics (androidx.compose.ui:ui-graphics:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -8920,9 +8920,9 @@
 
-Notice for Compose Layouts (androidx.compose.foundation:foundation-layout-android:1.12.0) +Notice for Compose Layouts (androidx.compose.foundation:foundation-layout-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -9002,9 +9002,9 @@
 
-Notice for Compose Layouts (androidx.compose.foundation:foundation-layout:1.12.0) +Notice for Compose Layouts (androidx.compose.foundation:foundation-layout:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -9576,9 +9576,9 @@
 
-Notice for Compose Material Ripple (androidx.compose.material:material-ripple-android:1.12.0) +Notice for Compose Material Ripple (androidx.compose.material:material-ripple-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-material#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-material#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -9658,9 +9658,9 @@
 
-Notice for Compose Material Ripple (androidx.compose.material:material-ripple:1.12.0) +Notice for Compose Material Ripple (androidx.compose.material:material-ripple:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-material#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-material#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -9904,9 +9904,9 @@
 
-Notice for Compose Runtime (androidx.compose.runtime:runtime-android:1.12.0) +Notice for Compose Runtime (androidx.compose.runtime:runtime-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -9986,9 +9986,9 @@
 
-Notice for Compose Runtime (androidx.compose.runtime:runtime:1.12.0) +Notice for Compose Runtime (androidx.compose.runtime:runtime:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -10232,9 +10232,9 @@
 
-Notice for Compose Runtime Annotation (androidx.compose.runtime:runtime-annotation-android:1.12.0) +Notice for Compose Runtime Annotation (androidx.compose.runtime:runtime-annotation-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -10314,9 +10314,9 @@
 
-Notice for Compose Runtime Annotation (androidx.compose.runtime:runtime-annotation:1.12.0) +Notice for Compose Runtime Annotation (androidx.compose.runtime:runtime-annotation:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -10396,9 +10396,9 @@
 
-Notice for Compose Runtime Retain (androidx.compose.runtime:runtime-retain-android:1.12.0) +Notice for Compose Runtime Retain (androidx.compose.runtime:runtime-retain-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -10478,9 +10478,9 @@
 
-Notice for Compose Runtime Retain (androidx.compose.runtime:runtime-retain:1.12.0) +Notice for Compose Runtime Retain (androidx.compose.runtime:runtime-retain:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -10560,9 +10560,9 @@
 
-Notice for Compose Saveable (androidx.compose.runtime:runtime-saveable-android:1.12.0) +Notice for Compose Saveable (androidx.compose.runtime:runtime-saveable-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -10642,9 +10642,9 @@
 
-Notice for Compose Saveable (androidx.compose.runtime:runtime-saveable:1.12.0) +Notice for Compose Saveable (androidx.compose.runtime:runtime-saveable:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -10888,9 +10888,9 @@
 
-Notice for Compose UI (androidx.compose.ui:ui-android:1.12.0) +Notice for Compose UI (androidx.compose.ui:ui-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -10970,9 +10970,9 @@
 
-Notice for Compose UI (androidx.compose.ui:ui:1.12.0) +Notice for Compose UI (androidx.compose.ui:ui:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -11216,9 +11216,9 @@
 
-Notice for Compose UI Preview Tooling (androidx.compose.ui:ui-tooling-preview-android:1.12.0) +Notice for Compose UI Preview Tooling (androidx.compose.ui:ui-tooling-preview-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -11298,9 +11298,9 @@
 
-Notice for Compose UI Preview Tooling (androidx.compose.ui:ui-tooling-preview:1.12.0) +Notice for Compose UI Preview Tooling (androidx.compose.ui:ui-tooling-preview:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -11380,9 +11380,9 @@
 
-Notice for Compose UI Text (androidx.compose.ui:ui-text-android:1.12.0) +Notice for Compose UI Text (androidx.compose.ui:ui-text-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -11462,9 +11462,9 @@
 
-Notice for Compose UI Text (androidx.compose.ui:ui-text:1.12.0) +Notice for Compose UI Text (androidx.compose.ui:ui-text:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -11708,9 +11708,9 @@
 
-Notice for Compose Unit (androidx.compose.ui:ui-unit-android:1.12.0) +Notice for Compose Unit (androidx.compose.ui:ui-unit-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -11790,9 +11790,9 @@
 
-Notice for Compose Unit (androidx.compose.ui:ui-unit:1.12.0) +Notice for Compose Unit (androidx.compose.ui:ui-unit:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -12036,9 +12036,9 @@
 
-Notice for Compose Util (androidx.compose.ui:ui-util-android:1.12.0) +Notice for Compose Util (androidx.compose.ui:ui-util-android:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -12118,9 +12118,9 @@
 
-Notice for Compose Util (androidx.compose.ui:ui-util:1.12.0) +Notice for Compose Util (androidx.compose.ui:ui-util:1.12.1)
-Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.0
+Source: https://developer.android.com/jetpack/androidx/releases/compose-ui#1.12.1
 
 Apache License
 Version 2.0, January 2004
@@ -13797,7 +13797,7 @@
 
-Notice for io.coil-kt.coil3:coil-compose-core:3.6.0 +Notice for io.coil-kt.coil3:coil-compose-core:3.6.3
 Source: https://github.com/coil-kt/coil
 
@@ -13879,7 +13879,7 @@
 
-Notice for io.coil-kt.coil3:coil-compose:3.6.0 +Notice for io.coil-kt.coil3:coil-compose:3.6.3
 Source: https://github.com/coil-kt/coil
 
@@ -13961,7 +13961,7 @@
 
-Notice for io.coil-kt.coil3:coil-core:3.6.0 +Notice for io.coil-kt.coil3:coil-core:3.6.3
 Source: https://github.com/coil-kt/coil
 
@@ -14043,7 +14043,7 @@
 
-Notice for io.coil-kt.coil3:coil-gif:3.6.0 +Notice for io.coil-kt.coil3:coil-gif:3.6.3
 Source: https://github.com/coil-kt/coil
 
@@ -14125,7 +14125,7 @@
 
-Notice for io.coil-kt.coil3:coil:3.6.0 +Notice for io.coil-kt.coil3:coil:3.6.3
 Source: https://github.com/coil-kt/coil
 
@@ -14789,7 +14789,7 @@
 
-Notice for Kotlin Stdlib (org.jetbrains.kotlin:kotlin-stdlib:2.4.10) +Notice for Kotlin Stdlib (org.jetbrains.kotlin:kotlin-stdlib:2.4.20)
 Source: https://kotlinlang.org/
 
@@ -14871,7 +14871,7 @@
 
-Notice for Kotlin Stdlib Common (org.jetbrains.kotlin:kotlin-stdlib-common:2.4.10) +Notice for Kotlin Stdlib Common (org.jetbrains.kotlin:kotlin-stdlib-common:2.4.20)
 Source: https://kotlinlang.org/
 
@@ -14953,7 +14953,7 @@
 
-Notice for kotlinx-collections-immutable (org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.5.1) +Notice for kotlinx-collections-immutable (org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.5.2)
 Source: https://github.com/Kotlin/kotlinx.collections.immutable
 
@@ -19213,7 +19213,7 @@
 
-Notice for org.jetbrains.kotlinx:kotlinx-collections-immutable:0.5.1 +Notice for org.jetbrains.kotlinx:kotlinx-collections-immutable:0.5.2
 Source: https://github.com/Kotlin/kotlinx.collections.immutable
 
@@ -19541,7 +19541,7 @@
 
-Notice for Parcelize Runtime (org.jetbrains.kotlin:kotlin-parcelize-runtime:2.4.10) +Notice for Parcelize Runtime (org.jetbrains.kotlin:kotlin-parcelize-runtime:2.4.20)
 Source: https://kotlinlang.org/
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d842293dc..56535e820 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,11 +1,11 @@
 [versions]
-agp = "9.3.2"
+agp = "9.4.1"
 detekt = "2.0.0-alpha.6"
 hilt = "2.60.1"
 jacoco = "0.8.15"
-kotlin = "2.4.10"
+kotlin = "2.4.20"
 kotlinx-serialization = "1.11.0"
-ksp = "2.3.11"
+ksp = "2.3.12"
 
 #noinspection UnusedVersionCatalogEntry
 ktlint = "1.8.0"
@@ -15,13 +15,13 @@ activity-compose = "1.13.0"
 appcompat = "1.8.0"
 androidx-hilt = "1.4.0"
 camerax = "1.6.2"
-coil = "3.6.0"
-compose-bom = "2026.08.00"
+coil = "3.6.3"
+compose-bom = "2026.09.00"
 coroutines = "1.11.0"
 glide = "5.0.9"
 guava = "33.7.1-android"
-kotlinx-collections-immutable = "0.5.1"
-libphonenumber = "9.0.38"
+kotlinx-collections-immutable = "0.5.2"
+libphonenumber = "9.0.39"
 lifecycle = "2.11.0"
 material3-adaptive = "1.3.0"
 navigation3 = "1.1.7"
@@ -30,7 +30,7 @@ photo-picker = "1.0.0-alpha02"
 
 junit4 = "4.13.2"
 mockk = "1.14.11"
-robolectric = "4.16.1"
+robolectric = "4.17"
 turbine = "1.2.1"
 
 androidx-test-espresso = "3.7.0"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e364c1762..43c8827af 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -961,9 +961,9 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
       
       
@@ -1000,6 +1000,23 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -1099,21 +1116,21 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -1150,6 +1167,23 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -1260,21 +1294,21 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -1322,6 +1356,23 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -1404,21 +1455,21 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -1455,6 +1506,23 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -1568,21 +1636,21 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -1689,18 +1757,18 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -1731,18 +1799,18 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -2066,6 +2134,23 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -2292,21 +2377,21 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -2428,6 +2513,23 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -2513,21 +2615,21 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -2598,21 +2700,38 @@
             
          
       
-      
-         
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -2722,6 +2841,23 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -2897,21 +3033,21 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -3004,6 +3140,23 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -3162,21 +3315,21 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -3257,6 +3410,20 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -3394,18 +3561,18 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -3498,6 +3665,23 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -3656,97 +3840,83 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
+            
          
       
       
@@ -3760,6 +3930,20 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -3850,6 +4034,23 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -4008,117 +4209,117 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -4211,6 +4412,23 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -4369,21 +4587,21 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -4464,6 +4682,20 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -4601,18 +4833,18 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
       
@@ -5024,26 +5256,26 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -7588,163 +7820,207 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
+         
+         
+            
+         
+      
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
+      
+         
+            
+         
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -7761,18 +8037,18 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -7789,111 +8065,111 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -7904,89 +8180,89 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -8017,480 +8293,228 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
-         
-         
-            
-         
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-      
-      
-         
-            
-         
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
-         
-         
-            
-         
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-      
-      
-         
-            
-         
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
-         
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
+      
+         
+            
          
          
             
@@ -8600,11 +8624,6 @@
             
          
       
-      
-         
-            
-         
-      
       
          
             
@@ -8622,62 +8641,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -8688,51 +8651,18 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -8763,9 +8693,9 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
       
       
@@ -8797,20 +8727,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -8843,18 +8759,10 @@
          
             
          
-         
-            
-         
          
             
          
       
-      
-         
-            
-         
-      
       
          
             
@@ -8870,20 +8778,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -8912,20 +8806,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -9059,9 +8939,9 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
       
       
@@ -9078,18 +8958,18 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -9103,21 +8983,21 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -9148,21 +9028,21 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -9179,35 +9059,21 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
+         
+            
          
       
       
@@ -9224,17 +9090,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -9257,31 +9112,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -9376,11 +9206,6 @@
             
          
       
-      
-         
-            
-         
-      
       
          
             
@@ -9391,16 +9216,6 @@
             
          
       
-      
-         
-            
-         
-      
-      
-         
-            
-         
-      
       
          
             
@@ -9426,11 +9241,6 @@
             
          
       
-      
-         
-            
-         
-      
       
          
             
@@ -9481,9 +9291,6 @@
          
             
          
-         
-            
-         
          
             
          
@@ -9527,28 +9334,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -9567,9 +9352,6 @@
          
             
          
-         
-            
-         
          
             
          
@@ -9633,20 +9415,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -9691,16 +9459,6 @@
             
          
       
-      
-         
-            
-         
-      
-      
-         
-            
-         
-      
       
          
             
@@ -9736,11 +9494,6 @@
             
          
       
-      
-         
-            
-         
-      
       
          
             
@@ -9773,17 +9526,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -9791,9 +9533,6 @@
          
             
          
-         
-            
-         
          
             
          
@@ -9855,11 +9594,6 @@
             
          
       
-      
-         
-            
-         
-      
       
          
             
@@ -9870,16 +9604,6 @@
             
          
       
-      
-         
-            
-         
-      
-      
-         
-            
-         
-      
       
          
             
@@ -9902,17 +9626,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -9938,42 +9651,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -9981,9 +9658,6 @@
          
             
          
-         
-            
-         
          
             
          
@@ -10002,37 +9676,9 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
+      
+         
+            
          
       
       
@@ -10040,11 +9686,6 @@
             
          
       
-      
-         
-            
-         
-      
       
          
             
@@ -10055,104 +9696,23 @@
             
          
       
-      
-         
-            
-         
-      
-      
-         
-            
-         
-      
-      
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
       
       
@@ -10169,37 +9729,37 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -11232,130 +10792,130 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
          
-            
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -11453,263 +11013,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -11805,466 +11108,86 @@
             
          
          
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-      
-      
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
+         
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -12602,6 +11525,23 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -12644,6 +11584,14 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -12872,6 +11820,20 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -12886,60 +11848,68 @@
             
          
       
-      
-         
-            
+      
+         
+            
+         
+         
+            
+         
+      
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -12984,23 +11954,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -13048,80 +12001,18 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
-            
-         
-      
-      
-         
-            
-         
-      
-      
-         
-            
-         
-      
-      
-         
-            
-         
-      
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -14134,83 +13025,89 @@
             
          
       
-      
-         
-            
+      
+         
+            
+         
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
+         
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -14340,69 +13237,75 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
+         
+         
+            
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
+            
+         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -14519,18 +13422,18 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -14572,18 +13475,18 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -14600,18 +13503,18 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -14628,32 +13531,18 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -14670,32 +13559,18 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -14740,32 +13615,18 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -14793,46 +13654,32 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -14849,32 +13696,18 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -14905,32 +13738,18 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -15060,69 +13879,75 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
+         
+         
+            
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
+         
+            
+         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -15150,18 +13975,18 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -15291,69 +14116,75 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
+         
+         
+            
+         
+         
+            
          
       
       
@@ -15387,21 +14218,21 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -15429,18 +14260,18 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -15521,12 +14352,12 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -15554,18 +14385,18 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -15621,46 +14452,46 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -15688,20 +14519,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -15879,18 +14696,18 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -15949,83 +14766,89 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
+         
+         
+            
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
+         
+            
+         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -16105,17 +14928,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -16211,9 +15023,6 @@
          
             
          
-         
-            
-         
          
             
          
@@ -16229,20 +15038,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -16567,24 +15362,24 @@
             
          
       
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -16715,9 +15510,6 @@
          
             
          
-         
-            
-         
          
             
          
@@ -16733,20 +15525,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -16779,12 +15557,12 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -16801,20 +15579,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -16930,9 +15694,6 @@
          
             
          
-         
-            
-         
          
             
          
@@ -17026,32 +15787,18 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
-      
-         
+      
+         
             
          
-         
+         
             
          
-         
+         
             
          
-         
-            
+         
+            
          
       
       
@@ -17068,18 +15815,18 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -17096,18 +15843,18 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -17135,33 +15882,33 @@
             
          
       
-      
-         
+      
+         
             
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
       
       
@@ -17221,17 +15968,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -17265,23 +16001,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -17304,35 +16023,35 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -17679,23 +16398,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -18027,6 +16729,14 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -18035,12 +16745,55 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
          
       
       
@@ -18076,6 +16829,23 @@
             
          
       
+      
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+         
+            
+         
+      
       
          
             
@@ -18118,9 +16888,6 @@
          
             
          
-         
-            
-         
          
             
          
@@ -18202,20 +16969,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -18244,20 +16997,6 @@
             
          
       
-      
-         
-            
-         
-         
-            
-         
-         
-            
-         
-         
-            
-         
-      
       
          
             
@@ -18311,210 +17050,210 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
       
       
@@ -18598,18 +17337,18 @@
             
          
       
-      
-         
-            
+      
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+            
          
-         
-            
+         
+