Merge branch 'dev/fahrur-new' into 'ENV-DEV'

Dev/fahrur new

See merge request !2161

package.json

 {
   "name": "my-app",
   "version": "0.1.0",
-  "homepage": "http://localhost:8080/web-staging/",
+  "homepage": "http://localhost:8080/web/",
   "private": true,
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",