Merge branch 'develop' into 'icon_picker_admin_config'

# Conflicts:
#   package.json

package.json

@@ -47,6 +47,7 @@
     "@babel/runtime": "^7.3.4",
     "@clusterws/cws": "^0.16.0",
     "@fonticonpicker/react-fonticonpicker": "^1.2.0",
+    "@popperjs/core": "^2.4.4",
     "array-includes": "^3.0.3",
     "autoprefixer": "^9.5.1",
     "axios": "^0.19.0",
@@ -115,6 +116,7 @@
     "react-motion": "^0.5.2",
     "react-notification": "^6.8.4",
     "react-overlays": "^0.8.3",
+    "react-popper": "^2.2.3",
     "react-redux": "^7.2.1",
     "react-redux-loading-bar": "^4.5.0",
     "react-router-dom": "^4.1.1",