Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	CONTRIBUTING.md
#	devicon.json

Author: amacado

CONTRIBUTING.md

@@ -81,6 +81,7 @@ First of all, thanks for taking the time to contribute! This project can only gr
   <li>Each <code>.svg</code> file contains one version of an icon in a <code>0 0 128 128</code> viewbox. You can use a service like <a href="https://www.iloveimg.com/resize-image/resize-svg">resize-image</a> for scaling the svg.</li>
   <li>The <code>svg</code> element does not need the <code>height</code> and <code>width</code> attributes. However, if you do use it, ensure their values are either <code>"128"</code> or <code>"128px"</code>. Ex: <code>height="128"</code></li>
   <li>Each <code>.svg</code> must use the <code>fill</code> attribute instead of using <code>classes</code> for colors. See <a href="https://github.com/devicons/devicon/issues/407">here</a> for more details.</li>
+  <li>The naming convention for the svg file is the following: <code>(Icon name)-(original|plain|line)(-wordmark?).</code></li>
 </ul>
 
 <hr>

devicon.json

@@ -2100,7 +2100,7 @@
         },
         "color": "#6dd0c7",
         "aliases": []
-      },
+    },
     {
         "name": "nestjs",
         "tags": [