Merge branch 'master' into dev

# Conflicts:
#	CHANGELOG.md
#	package.json

Author: OliverDudgeon

package.json

@@ -2,7 +2,7 @@
   "name": "@squonk/data-manager-ui",
   "author": "Oliver Dudgeon",
   "license": "Apache-2.0",
-  "version": "6.2.0-dev.6",
+  "version": "6.2.0",
   "private": true,
   "repository": {
     "type": "git",