Merge branch 'dev' into dependabot/gradle/software/oqm-core-api/dev/tech.units-indriya-2.2.2

Author: GregJohnStewart

.all-contributorsrc

@@ -143,6 +143,49 @@
         "userTesting",
         "maintenance"
       ]
+    },
+    {
+      "login": "mulliar22",
+      "name": "mulliar22",
+      "avatar_url": "https://avatars.githubusercontent.com/u/168582625?v=4",
+      "profile": "https://github.com/mulliar22",
+      "contributions": [
+        "code",
+        "data",
+        "doc",
+        "example",
+        "plugin",
+        "research"
+      ]
+    },
+    {
+      "login": "mallom21",
+      "name": "mallom21",
+      "avatar_url": "https://avatars.githubusercontent.com/u/113387289?v=4",
+      "profile": "https://github.com/mallom21",
+      "contributions": [
+        "code",
+        "data",
+        "doc",
+        "example",
+        "plugin",
+        "research",
+        "projectManagement"
+      ]
+    },
+    {
+      "login": "Coletrane315",
+      "name": "Coletrane315",
+      "avatar_url": "https://avatars.githubusercontent.com/u/52933325?v=4",
+      "profile": "https://github.com/Coletrane315",
+      "contributions": [
+        "code",
+        "data",
+        "doc",
+        "example",
+        "plugin",
+        "research"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.gitignore

@@ -1,6 +1,8 @@
 # Compiled class file
 *.class
 
+*/aws-cred.src
+
 # Log file
 *.log
 
@@ -22,3 +24,5 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+*.idea/*