Merged settings branch with master and added camera

.gradle/5.1.1/executionHistory/executionHistory.bin

.gradle/5.1.1/executionHistory/executionHistory.lock

.gradle/5.1.1/fileHashes/fileHashes.bin

.gradle/5.1.1/fileHashes/fileHashes.lock

.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/outputFiles.bin

.idea/caches/build_file_checksums.ser

...libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml

...ies/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml

...radle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml

...ries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml

...es/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml

...m_android_support_animated_vector_drawable_28_0_0_aar.xml

...s/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml

...e__com_android_support_asynclayoutinflater_28_0_0_aar.xml

...es/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml

...ndroid_support_constraint_constraint_layout_1_1_3_aar.xml