Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage

# Conflicts:
#	package-lock.json
#	package.json
#	vendor/composer/autoload_static.php
#	yarn.lock

package.json

@@ -20,6 +20,7 @@
     "@xkeshi/vue-countdown": "^0.6.0",
     "axios": "^0.18.0",
     "bootstrap": "^4.0.0",
+    "canvas2image": "^1.0.5",
     "element-ui": "^2.3.9",
     "jquery": "^3.3.1",
     "js-cookie": "^2.2.0",
@@ -34,7 +35,8 @@
     "vue-meta": "^1.4.4",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1",
-    "vuex-router-sync": "^5.0.0"
+    "vuex-router-sync": "^5.0.0",
+    "webpack": "^4.14.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-eslint": "^3.0.0-beta.6",