Merge branch 'develop' of https://github.com/DivanteLtd/vue-storefront-api into develop

# Conflicts:
#	var/catalog.json
#	var/catalog_de.json
#	var/catalog_it.json

Author: pkarw

src/index.js

@@ -1,4 +1,4 @@
-import '@babel/polyfill';
+import '@babel/polyfill/noConflict';
 import http from 'http';
 import express from 'express';
 import cors from 'cors';