diff --git a/.gradle/4.10.1/fileHashes/fileHashes.bin b/.gradle/4.10.1/fileHashes/fileHashes.bin index b0954ce0..ef8d51a4 100644 Binary files a/.gradle/4.10.1/fileHashes/fileHashes.bin and b/.gradle/4.10.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/4.10.1/fileHashes/fileHashes.lock b/.gradle/4.10.1/fileHashes/fileHashes.lock index 8094dde1..6cd11555 100644 Binary files a/.gradle/4.10.1/fileHashes/fileHashes.lock and b/.gradle/4.10.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/4.10.1/fileHashes/resourceHashesCache.bin b/.gradle/4.10.1/fileHashes/resourceHashesCache.bin index 0fcbc91f..937cd5a9 100644 Binary files a/.gradle/4.10.1/fileHashes/resourceHashesCache.bin and b/.gradle/4.10.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/4.10.1/javaCompile/classAnalysis.bin b/.gradle/4.10.1/javaCompile/classAnalysis.bin index 8199afbb..28977b41 100644 Binary files a/.gradle/4.10.1/javaCompile/classAnalysis.bin and b/.gradle/4.10.1/javaCompile/classAnalysis.bin differ diff --git a/.gradle/4.10.1/javaCompile/jarAnalysis.bin b/.gradle/4.10.1/javaCompile/jarAnalysis.bin index 0ec5ddb2..10ad06be 100644 Binary files a/.gradle/4.10.1/javaCompile/jarAnalysis.bin and b/.gradle/4.10.1/javaCompile/jarAnalysis.bin differ diff --git a/.gradle/4.10.1/javaCompile/javaCompile.lock b/.gradle/4.10.1/javaCompile/javaCompile.lock index 59096748..529dc31f 100644 Binary files a/.gradle/4.10.1/javaCompile/javaCompile.lock and b/.gradle/4.10.1/javaCompile/javaCompile.lock differ diff --git a/.gradle/4.10.1/javaCompile/taskHistory.bin b/.gradle/4.10.1/javaCompile/taskHistory.bin index c3be32c0..5e0d07cf 100644 Binary files a/.gradle/4.10.1/javaCompile/taskHistory.bin and b/.gradle/4.10.1/javaCompile/taskHistory.bin differ diff --git a/.gradle/4.10.1/taskHistory/taskHistory.bin b/.gradle/4.10.1/taskHistory/taskHistory.bin index ead41b20..4e3f3cc1 100644 Binary files a/.gradle/4.10.1/taskHistory/taskHistory.bin and b/.gradle/4.10.1/taskHistory/taskHistory.bin differ diff --git a/.gradle/4.10.1/taskHistory/taskHistory.lock b/.gradle/4.10.1/taskHistory/taskHistory.lock index 316ee959..f5606682 100644 Binary files a/.gradle/4.10.1/taskHistory/taskHistory.lock and b/.gradle/4.10.1/taskHistory/taskHistory.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index ae50eec2..63657edd 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 58bf5ffc..5d21718b 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d291b3d7..54232e27 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,15 +1,22 @@ + diff --git a/.idea/libraries/Gradle____local_aars____Users_ainki_Documents_VERDNATURA_vn_sales_verdnaturaventas_libs_acra_4_5_0_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars_____verdnaturaventas_libs_acra_4_5_0_jar_unspecified_jar.xml similarity index 55% rename from .idea/libraries/Gradle____local_aars____Users_ainki_Documents_VERDNATURA_vn_sales_verdnaturaventas_libs_acra_4_5_0_jar_unspecified_jar.xml rename to .idea/libraries/Gradle____local_aars_____verdnaturaventas_libs_acra_4_5_0_jar_unspecified_jar.xml index fcad1260..ffb9048c 100644 --- a/.idea/libraries/Gradle____local_aars____Users_ainki_Documents_VERDNATURA_vn_sales_verdnaturaventas_libs_acra_4_5_0_jar_unspecified_jar.xml +++ b/.idea/libraries/Gradle____local_aars_____verdnaturaventas_libs_acra_4_5_0_jar_unspecified_jar.xml @@ -1,5 +1,5 @@ - + diff --git a/.idea/libraries/Gradle____local_aars____Users_ainki_Documents_VERDNATURA_vn_sales_verdnaturaventas_libs_activation_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars_____verdnaturaventas_libs_activation_jar_unspecified_jar.xml similarity index 55% rename from .idea/libraries/Gradle____local_aars____Users_ainki_Documents_VERDNATURA_vn_sales_verdnaturaventas_libs_activation_jar_unspecified_jar.xml rename to .idea/libraries/Gradle____local_aars_____verdnaturaventas_libs_activation_jar_unspecified_jar.xml index 67285b78..427a0a4e 100644 --- a/.idea/libraries/Gradle____local_aars____Users_ainki_Documents_VERDNATURA_vn_sales_verdnaturaventas_libs_activation_jar_unspecified_jar.xml +++ b/.idea/libraries/Gradle____local_aars_____verdnaturaventas_libs_activation_jar_unspecified_jar.xml @@ -1,5 +1,5 @@ - + diff --git a/.idea/libraries/Gradle____local_aars____Users_ainki_Documents_VERDNATURA_vn_sales_verdnaturaventas_libs_additionnal_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars_____verdnaturaventas_libs_additionnal_jar_unspecified_jar.xml similarity index 55% rename from .idea/libraries/Gradle____local_aars____Users_ainki_Documents_VERDNATURA_vn_sales_verdnaturaventas_libs_additionnal_jar_unspecified_jar.xml rename to .idea/libraries/Gradle____local_aars_____verdnaturaventas_libs_additionnal_jar_unspecified_jar.xml index f1c47d65..d58075d6 100644 --- a/.idea/libraries/Gradle____local_aars____Users_ainki_Documents_VERDNATURA_vn_sales_verdnaturaventas_libs_additionnal_jar_unspecified_jar.xml +++ b/.idea/libraries/Gradle____local_aars_____verdnaturaventas_libs_additionnal_jar_unspecified_jar.xml @@ -1,5 +1,5 @@ - + diff --git a/.idea/libraries/Gradle____local_aars____Users_ainki_Documents_VERDNATURA_vn_sales_verdnaturaventas_libs_mail_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars_____verdnaturaventas_libs_mail_jar_unspecified_jar.xml similarity index 55% rename from .idea/libraries/Gradle____local_aars____Users_ainki_Documents_VERDNATURA_vn_sales_verdnaturaventas_libs_mail_jar_unspecified_jar.xml rename to .idea/libraries/Gradle____local_aars_____verdnaturaventas_libs_mail_jar_unspecified_jar.xml index 24d4e1b2..760573df 100644 --- a/.idea/libraries/Gradle____local_aars____Users_ainki_Documents_VERDNATURA_vn_sales_verdnaturaventas_libs_mail_jar_unspecified_jar.xml +++ b/.idea/libraries/Gradle____local_aars_____verdnaturaventas_libs_mail_jar_unspecified_jar.xml @@ -1,5 +1,5 @@ - + diff --git a/.idea/libraries/Gradle__com_getbase_floatingactionbutton_1_6_0_aar.xml b/.idea/libraries/Gradle__com_getbase_floatingactionbutton_1_6_0_aar.xml index 958bac85..b52de419 100644 --- a/.idea/libraries/Gradle__com_getbase_floatingactionbutton_1_6_0_aar.xml +++ b/.idea/libraries/Gradle__com_getbase_floatingactionbutton_1_6_0_aar.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/.idea/libraries/Gradle__com_github_ksoichiro_android_observablescrollview_1_5_0_aar.xml b/.idea/libraries/Gradle__com_github_ksoichiro_android_observablescrollview_1_5_0_aar.xml index da2d5306..1e0b01c0 100644 --- a/.idea/libraries/Gradle__com_github_ksoichiro_android_observablescrollview_1_5_0_aar.xml +++ b/.idea/libraries/Gradle__com_github_ksoichiro_android_observablescrollview_1_5_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml index 0b49a0af..c3f58a74 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml index d6453b60..5826b562 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml index af907653..e16900c4 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml index f7e60501..d318258a 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml index 97f587a6..c9e2932a 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml index d3750bd3..bbcdd944 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml index 35dc6aa9..666bc12f 100644 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml index 9c70c8fa..0c069bb2 100644 --- a/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml +++ b/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml @@ -1,12 +1,10 @@ - - + + - - - + diff --git a/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml index a10749e7..f77469ae 100644 --- a/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml +++ b/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml @@ -1,12 +1,10 @@ - - + + - - - + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml index ff7105b3..9bcbcd7c 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml index 5f3e7b0f..d3d6b053 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml index e774561f..6a7b1fe1 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_firestore_15_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_firestore_15_0_0_aar.xml index e0c098cc..92baa338 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_firestore_15_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_firestore_15_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_1_aar.xml index 766a3f4f..9a88991d 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml index 4eb818e2..b749e144 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml index 698ea323..8b6f4ebf 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml index f9fb69d9..3c4bbbb3 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml index 2f55fa85..4decefb5 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml index 0b311ccb..e5dd5a01 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_messaging_17_3_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_messaging_17_3_1_aar.xml index 71fba998..f62b826a 100644 --- a/.idea/libraries/Gradle__com_google_firebase_firebase_messaging_17_3_1_aar.xml +++ b/.idea/libraries/Gradle__com_google_firebase_firebase_messaging_17_3_1_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml b/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml index 5c4eba98..fa236408 100644 --- a/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml +++ b/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_71828_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__commons_codec_commons_codec_1_9_jar.xml b/.idea/libraries/Gradle__commons_codec_commons_codec_1_9_jar.xml deleted file mode 100644 index 1a0ac9f2..00000000 --- a/.idea/libraries/Gradle__commons_codec_commons_codec_1_9_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_logging_commons_logging_1_2_jar.xml b/.idea/libraries/Gradle__commons_logging_commons_logging_1_2_jar.xml deleted file mode 100644 index 92a6bd54..00000000 --- a/.idea/libraries/Gradle__commons_logging_commons_logging_1_2_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_13_aar.xml b/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_13_aar.xml index 16e6557c..9d077c21 100644 --- a/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_13_aar.xml +++ b/.idea/libraries/Gradle__me_dm7_barcodescanner_core_1_9_13_aar.xml @@ -1,8 +1,8 @@ - - + + diff --git a/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_5_jar.xml b/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_5_jar.xml deleted file mode 100644 index a80b291a..00000000 --- a/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_5_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_4_1_jar.xml b/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_4_1_jar.xml deleted file mode 100644 index fbcfe01d..00000000 --- a/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_4_1_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6214f349..62e1ceab 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,10 +2,10 @@ - - - - + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 07aec0b8..ab53d1a9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,14 +7,6 @@ - - - - - - - - @@ -25,198 +17,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - + + + - - - - - - - @@ -235,11 +73,7 @@ - - - - @@ -250,7 +84,6 @@ - @@ -268,8 +101,6 @@ - - @@ -281,15 +112,12 @@ - - - @@ -308,30 +136,9 @@ - - - - - - - - - - - - - - - - - - - - - @@ -339,647 +146,94 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -990,132 +244,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1125,107 +256,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1236,101 +267,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1340,120 +277,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1469,1192 +297,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - -