diff --git a/.gradle/4.4/fileChanges/last-build.bin b/.gradle/4.4/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/4.4/fileChanges/last-build.bin differ diff --git a/.gradle/4.4/fileContent/fileContent.lock b/.gradle/4.4/fileContent/fileContent.lock new file mode 100644 index 0000000..cdcdd7c Binary files /dev/null and b/.gradle/4.4/fileContent/fileContent.lock differ diff --git a/.gradle/4.4/fileHashes/fileHashes.bin b/.gradle/4.4/fileHashes/fileHashes.bin new file mode 100644 index 0000000..0ee8919 Binary files /dev/null and b/.gradle/4.4/fileHashes/fileHashes.bin differ diff --git a/.gradle/4.4/fileHashes/fileHashes.lock b/.gradle/4.4/fileHashes/fileHashes.lock new file mode 100644 index 0000000..4c0e4a2 Binary files /dev/null and b/.gradle/4.4/fileHashes/fileHashes.lock differ diff --git a/.gradle/4.4/fileHashes/resourceHashesCache.bin b/.gradle/4.4/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..6563ced Binary files /dev/null and b/.gradle/4.4/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/4.4/javaCompile/classAnalysis.bin b/.gradle/4.4/javaCompile/classAnalysis.bin new file mode 100644 index 0000000..701b6a4 Binary files /dev/null and b/.gradle/4.4/javaCompile/classAnalysis.bin differ diff --git a/.gradle/4.4/javaCompile/jarAnalysis.bin b/.gradle/4.4/javaCompile/jarAnalysis.bin new file mode 100644 index 0000000..b39bf75 Binary files /dev/null and b/.gradle/4.4/javaCompile/jarAnalysis.bin differ diff --git a/.gradle/4.4/javaCompile/javaCompile.lock b/.gradle/4.4/javaCompile/javaCompile.lock new file mode 100644 index 0000000..2c88843 Binary files /dev/null and b/.gradle/4.4/javaCompile/javaCompile.lock differ diff --git a/.gradle/4.4/javaCompile/taskHistory.bin b/.gradle/4.4/javaCompile/taskHistory.bin new file mode 100644 index 0000000..1490076 Binary files /dev/null and b/.gradle/4.4/javaCompile/taskHistory.bin differ diff --git a/.gradle/4.4/javaCompile/taskJars.bin b/.gradle/4.4/javaCompile/taskJars.bin new file mode 100644 index 0000000..884bb45 Binary files /dev/null and b/.gradle/4.4/javaCompile/taskJars.bin differ diff --git a/.gradle/4.4/taskHistory/taskHistory.bin b/.gradle/4.4/taskHistory/taskHistory.bin new file mode 100644 index 0000000..949aba8 Binary files /dev/null and b/.gradle/4.4/taskHistory/taskHistory.bin differ diff --git a/.gradle/4.4/taskHistory/taskHistory.lock b/.gradle/4.4/taskHistory/taskHistory.lock new file mode 100644 index 0000000..aa114fd Binary files /dev/null and b/.gradle/4.4/taskHistory/taskHistory.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..b4a09e0 Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..68f8ba5 --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Wed Aug 01 09:36:24 CST 2018 +gradle.version=4.4 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..e75a9fd Binary files /dev/null and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..2cea2f9 Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_25_3_1.xml new file mode 100644 index 0000000..3c946bc --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_25_3_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_25_3_1.xml new file mode 100644 index 0000000..234476a --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_25_3_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2.xml new file mode 100644 index 0000000..53816f6 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/constraint_layout_solver_1_0_2.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_0_2_jar.xml similarity index 76% rename from .idea/libraries/constraint_layout_solver_1_0_2.xml rename to .idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_0_2_jar.xml index 1645e21..b5bafe9 100644 --- a/.idea/libraries/constraint_layout_solver_1_0_2.xml +++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_0_2_jar.xml @@ -1,5 +1,5 @@ - + diff --git a/.idea/libraries/support_annotations_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_25_3_1_jar.xml similarity index 61% rename from .idea/libraries/support_annotations_25_3_1.xml rename to .idea/libraries/Gradle__com_android_support_support_annotations_25_3_1_jar.xml index 42adfc6..809f7cf 100644 --- a/.idea/libraries/support_annotations_25_3_1.xml +++ b/.idea/libraries/Gradle__com_android_support_support_annotations_25_3_1_jar.xml @@ -1,9 +1,11 @@ - + - + + + diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_compat_25_3_1.xml new file mode 100644 index 0000000..3c85c5f --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_compat_25_3_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_25_3_1.xml new file mode 100644 index 0000000..28e52e3 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_core_ui_25_3_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_25_3_1.xml new file mode 100644 index 0000000..1685771 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_25_3_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_25_3_1.xml new file mode 100644 index 0000000..b63c056 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_fragment_25_3_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_25_3_1.xml new file mode 100644 index 0000000..a4cdabd --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_25_3_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_v4_25_3_1.xml new file mode 100644 index 0000000..347b1d9 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_v4_25_3_1.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_25_3_1.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_25_3_1.xml new file mode 100644 index 0000000..6b6f248 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_25_3_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2.xml new file mode 100644 index 0000000..8a6c135 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2.xml new file mode 100644 index 0000000..15947a8 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5.xml b/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5.xml new file mode 100644 index 0000000..7a843af --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_test_rules_0_5.xml b/.idea/libraries/Gradle__com_android_support_test_rules_0_5.xml new file mode 100644 index 0000000..5ff3933 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_test_rules_0_5.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_test_runner_0_5.xml b/.idea/libraries/Gradle__com_android_support_test_runner_0_5.xml new file mode 100644 index 0000000..9e673ac --- /dev/null +++ b/.idea/libraries/Gradle__com_android_support_test_runner_0_5.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/jsr305_2_0_1.xml b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml similarity index 80% rename from .idea/libraries/jsr305_2_0_1.xml rename to .idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml index cdf9878..947e251 100644 --- a/.idea/libraries/jsr305_2_0_1.xml +++ b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml @@ -1,5 +1,5 @@ - + diff --git a/.idea/libraries/javawriter_2_1_1.xml b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml similarity index 50% rename from .idea/libraries/javawriter_2_1_1.xml rename to .idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml index a66fefb..5c4dd4e 100644 --- a/.idea/libraries/javawriter_2_1_1.xml +++ b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml @@ -1,9 +1,11 @@ - + - + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2_jar.xml b/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2_jar.xml new file mode 100644 index 0000000..568ea48 --- /dev/null +++ b/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/javax_inject_1.xml b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml similarity index 88% rename from .idea/libraries/javax_inject_1.xml rename to .idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml index eebeedd..f9c9a30 100644 --- a/.idea/libraries/javax_inject_1.xml +++ b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml @@ -1,5 +1,5 @@ - + diff --git a/.idea/libraries/junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml similarity index 90% rename from .idea/libraries/junit_4_12.xml rename to .idea/libraries/Gradle__junit_junit_4_12_jar.xml index 305df30..f4f25a8 100644 --- a/.idea/libraries/junit_4_12.xml +++ b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml @@ -1,5 +1,5 @@ - + diff --git a/.idea/libraries/hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml similarity index 88% rename from .idea/libraries/hamcrest_core_1_3.xml rename to .idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml index 157e3f3..50cf2b9 100644 --- a/.idea/libraries/hamcrest_core_1_3.xml +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml @@ -1,5 +1,5 @@ - + diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml new file mode 100644 index 0000000..a5eaca5 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hamcrest_library_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml similarity index 88% rename from .idea/libraries/hamcrest_library_1_3.xml rename to .idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml index 923d5fc..b4dabdc 100644 --- a/.idea/libraries/hamcrest_library_1_3.xml +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml @@ -1,5 +1,5 @@ - + diff --git a/.idea/libraries/animated_vector_drawable_25_3_1.xml b/.idea/libraries/animated_vector_drawable_25_3_1.xml deleted file mode 100644 index be6716e..0000000 --- a/.idea/libraries/animated_vector_drawable_25_3_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_25_3_1.xml b/.idea/libraries/appcompat_v7_25_3_1.xml deleted file mode 100644 index 0d5104c..0000000 --- a/.idea/libraries/appcompat_v7_25_3_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/constraint_layout_1_0_2.xml b/.idea/libraries/constraint_layout_1_0_2.xml deleted file mode 100644 index 562280e..0000000 --- a/.idea/libraries/constraint_layout_1_0_2.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/espresso_core_2_2_2.xml b/.idea/libraries/espresso_core_2_2_2.xml deleted file mode 100644 index ffe27ac..0000000 --- a/.idea/libraries/espresso_core_2_2_2.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/espresso_idling_resource_2_2_2.xml b/.idea/libraries/espresso_idling_resource_2_2_2.xml deleted file mode 100644 index 0fbb394..0000000 --- a/.idea/libraries/espresso_idling_resource_2_2_2.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml deleted file mode 100644 index 6fcb861..0000000 --- a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/hamcrest_integration_1_3.xml b/.idea/libraries/hamcrest_integration_1_3.xml deleted file mode 100644 index 58b2c4b..0000000 --- a/.idea/libraries/hamcrest_integration_1_3.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/javax_annotation_api_1_2.xml b/.idea/libraries/javax_annotation_api_1_2.xml deleted file mode 100644 index 811e73f..0000000 --- a/.idea/libraries/javax_annotation_api_1_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/rules_0_5.xml b/.idea/libraries/rules_0_5.xml deleted file mode 100644 index 9b2d978..0000000 --- a/.idea/libraries/rules_0_5.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/runner_0_5.xml b/.idea/libraries/runner_0_5.xml deleted file mode 100644 index 8513477..0000000 --- a/.idea/libraries/runner_0_5.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_compat_25_3_1.xml b/.idea/libraries/support_compat_25_3_1.xml deleted file mode 100644 index b940f62..0000000 --- a/.idea/libraries/support_compat_25_3_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_core_ui_25_3_1.xml b/.idea/libraries/support_core_ui_25_3_1.xml deleted file mode 100644 index 4bc05eb..0000000 --- a/.idea/libraries/support_core_ui_25_3_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_core_utils_25_3_1.xml b/.idea/libraries/support_core_utils_25_3_1.xml deleted file mode 100644 index e8df116..0000000 --- a/.idea/libraries/support_core_utils_25_3_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_fragment_25_3_1.xml b/.idea/libraries/support_fragment_25_3_1.xml deleted file mode 100644 index d23e2b7..0000000 --- a/.idea/libraries/support_fragment_25_3_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_media_compat_25_3_1.xml b/.idea/libraries/support_media_compat_25_3_1.xml deleted file mode 100644 index d66aeb9..0000000 --- a/.idea/libraries/support_media_compat_25_3_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_25_3_1.xml b/.idea/libraries/support_v4_25_3_1.xml deleted file mode 100644 index ebcc1c0..0000000 --- a/.idea/libraries/support_v4_25_3_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_vector_drawable_25_3_1.xml b/.idea/libraries/support_vector_drawable_25_3_1.xml deleted file mode 100644 index 2f5f485..0000000 --- a/.idea/libraries/support_vector_drawable_25_3_1.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d19981..99202cc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,18 +1,16 @@ - - - @@ -27,17 +25,7 @@ - - - - - - - - - - - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 29e0535..75a3df8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,17 +1,69 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -35,119 +83,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + @@ -155,22 +97,18 @@ - - + + - - - - - - - - - - - + + + - + @@ -2886,143 +3108,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + + + + + + + + + + + + + + + + + + +