Merge branch 'master' into features/add-scala

Author: weh

devicon-colors.css

@@ -566,6 +566,13 @@
 .devicon-rust-plain.colored {
 	color: #000000;
 }
+.devicon-groovy-plain.colored {
+	color: #619cbc;
+}
+.devicon-grails-original.colored,
+.devicon-grails-plain.colored {
+	color: #feb672;
+}
 .devicon-scala-plain-wordmark.colored,
 .devicon-scala-plain.colored {
 	color: #de3423;

devicon.json

@@ -407,6 +407,21 @@
       "font": ["plain", "plain-wordmark"]
     }
   },
+  {
+    "name": "grails",
+    "tags": ["framework"],
+    "versions": {
+      "svg": ["original", "plain"],
+      "font": ["original", "plain"]
+    }
+  },
+    "name": "groovy",
+    "tags": ["programming", "language"],
+    "versions": {
+      "svg": ["original", "plain"],
+      "font": ["plain"]
+    }
+  },
   {
     "name": "grunt",
     "tags": ["task-runner", "nodejs"],