Merge branch 'master' into develop (Add fingerprint)

.gitignore

@@ -1,3 +1,8 @@
+.DS_Store
+/build
+/app/build
+/projectFilesBackup
+
 # Built application files
 *.apk
 *.ap_
@@ -34,6 +39,7 @@ captures/
 
 # Intellij
 *.iml
+<<<<<<< HEAD
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
@@ -43,12 +49,19 @@ captures/
 # Keystore files
 # Uncomment the following line if you do not want to check your keystore files in.
 #*.jks
+=======
+.idea/*
+
+# Keystore files
+*.jks
+>>>>>>> master
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
 
 # Google Services (e.g. APIs or Firebase)
 google-services.json
+<<<<<<< HEAD
 
 # Freeline
 freeline.py
@@ -56,4 +69,6 @@ freeline/
 freeline_project_description.json
 
 # Iml Files
-app/app.iml
+app/app.iml
+=======
+>>>>>>> master