Merge branch 'release-1.2'

Author: davidmigloz

.gitignore

@@ -1,4 +1,3 @@
-
 # Created by https://www.gitignore.io/api/android,intellij,opencv,gradle
 
 ### Android ###
@@ -21,12 +20,19 @@ out/
 .gradle/
 build/
 
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Sensitive files
+secrets/
+secrets\.tar
+
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Proguard folder generated by Eclipse
-proguard/
-
 # Log Files
 *.log
 
@@ -36,74 +42,43 @@ proguard/
 # Android Studio captures folder
 captures/
 
-# Intellij
-*.iml
-.idea/workspace.xml
-.idea/libraries
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
 
-# Keystore files
-*.jks
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
 
 ### Android Patch ###
 gen-external-apklibs
 
-
 ### Intellij ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems
 
 # User-specific stuff:
-.idea/
-#.idea/workspace.xml
-#.idea/tasks.xml
-#.idea/dictionaries
-#.idea/vcs.xml
-#.idea/jsLibraryMappings.xml
-
-# Sensitive or high-churn files:
-#.idea/dataSources.ids
-#.idea/dataSources.xml
-#.idea/dataSources.local.xml
-#.idea/sqlDataSources.xml
-#.idea/dynamic.xml
-#.idea/uiDesigner.xml
+.idea/**/workspace.xml
+.idea/**/tasks.xml
 
 # Gradle:
-#.idea/gradle.xml
-#.idea/libraries
-
-# Mongo Explorer plugin:
-#.idea/mongoSettings.xml
-
-## File-based project format:
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
+*.iml
+.idea/**/gradle.xml
+.idea/**/misc.xml
+.idea/**/libraries
 
-# mpeltonen/sbt-idea plugin
-.idea_modules/
+# CMake
+cmake-build-debug/
 
-# JIRA plugin
-atlassian-ide-plugin.xml
+# Sonarlint plugin
+.idea/sonarlint
 
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 
-### Intellij Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
-
-# *.iml
-# modules.xml
-# .idea/misc.xml 
-# *.ipr
-
-
 ### OpenCV ###
 #OpenCV for Mac and Linux
 #build and release folders
@@ -113,19 +88,4 @@ fabric.properties
 */cmake_install.cmake
 .DS_Store
 
-
-### Gradle ###
-.gradle
-/build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-# Cache of project
-.gradletasknamecache
-
-# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
-# gradle/wrapper/gradle-wrapper.properties
+# End of https://www.gitignore.io/api/android,intellij,opencv,gradle