Merge branch 'settings' into 'master'

.gradle/5.1.1/executionHistory/executionHistory.bin

.gradle/5.1.1/executionHistory/executionHistory.lock

.gradle/5.1.1/fileChanges/last-build.bin

.gradle/5.1.1/fileContent/fileContent.lock

.gradle/5.1.1/fileHashes/fileHashes.bin

.gradle/5.1.1/fileHashes/fileHashes.lock

.gradle/5.1.1/fileHashes/resourceHashesCache.bin

.gradle/5.1.1/gc.properties

.gradle/5.1.1/javaCompile/classAnalysis.bin

.gradle/5.1.1/javaCompile/javaCompile.lock

.gradle/5.1.1/javaCompile/taskHistory.bin

.gradle/buildOutputCleanup/buildOutputCleanup.lock

.gradle/buildOutputCleanup/cache.properties

.gradle/buildOutputCleanup/outputFiles.bin

.gradle/vcs-1/gc.properties

.gradle/vcsWorkingDirs/gc.properties

.idea/assetWizardSettings.xml

.idea/caches/build_file_checksums.ser

.idea/caches/gradle_models.ser

.idea/encodings.xml