Merge branch 'develop' into datatables

Author: canaleal

devicon.json

@@ -5537,6 +5537,33 @@
         "color": "#4285f4",
         "aliases": []
     },
+    {
+        "name": "jhipster",
+        "altnames": [],
+        "tags": [
+            "development",
+            "framework",
+            "java",
+            "platform",
+            "web",
+            "web-application",
+            "web-development"
+        ],
+        "versions": {
+            "svg": [
+                "original",
+                "original-wordmark",
+                "plain",
+                "plain-wordmark"
+            ],
+            "font": [
+                "plain",
+                "plain-wordmark"
+            ]
+        },
+        "color": "#4289c7",
+        "aliases": []
+    },
     {
         "name": "jira",
         "altnames": [
@@ -7787,6 +7814,29 @@
         "color": "#76d04b",
         "aliases": []
     },
+    {
+        "name": "nodered",
+        "altnames": [
+			"node-red"
+        ],
+        "tags": [
+            "programming",
+            "tool"
+        ],
+        "versions": {
+            "svg": [
+                "original",
+                "plain",
+                "line"
+            ],
+            "font": [
+                "plain",
+                "line"
+            ]
+        },
+        "color": "#8f0000",
+        "aliases": []
+    },
     {
         "name": "nodewebkit",
         "altnames": [