Merge branch 'master' into dev

# Conflicts:
#	src/config/production.json
#	src/lib/constants/cryptos/data.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "adamant-im",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "author": "ADAMANT Foundation <[email protected]>",
   "license": "GPLv3",
   "description": "Decentralized Messenger",

src/components/icons/cryptos/BzzIcon.vue

@@ -0,0 +1,9 @@
+<template>
+  <g>
+    <path
+      d="M16,302.3v129.1L127.9,496l112-64.6V302.3l-112-64.6L16,302.3z M384.1,237.7l-112,64.6v129.1
+  l112,64.6L496,431.4V302.3L384.1,237.7z M367.9,145.3l-56-32.4V48.3L256,16L144.1,80.6v129.1L256,274.3l111.9-64.6V145.3z
+   M367.9,145.3l55.9-32.5V48.3L367.9,16l-56,32.3l56,32.2V145.3z"
+    />
+  </g>
+</template>

src/components/icons/cryptos/FluxIcon.vue

@@ -0,0 +1,11 @@
+<template>
+  <g>
+    <path
+      d="M257.6,16c-0.5,0-1,0-1.6,0C123.4,16,16,123.5,16,256c0,131.9,106.5,239.1,238.4,240
+  C387,496.9,495.1,390.1,496,257.6C496.9,125,390.1,16.9,257.6,16z M125.4,334.3v-49.2l42.5-24.5l42.8,24.5v49.2L168,358.8
+  L125.4,334.3z M258.7,410.8l-59.1-34.1l26.9-15.6h1.1l58.6,34.1L258.7,410.8z M391.8,334.4l-73.9,42.7L244,334.4V249l74.1-42.7
+  l73.8,42.7V334.4z M391.8,212.6L333.7,179l-15.6-9.1l-15.6,9.1l-74.1,42.8l-15.6,9.1v19.5l-28.9-17.2l-15.6-9.1l-15.6,9.1
+  l-27.2,15.5v-68.1l133.1-76.7l133.3,76.7V212.6z"
+    />
+  </g>
+</template>