APPWEB-97, APPWEB-96, APPWEB-106, APPWEB-123
Merge branch 'master' of https://github.com/Appverse/appverse-web.git
Missed files from last commit