Merge remote-tracking branch 'origin/dev/base' into static

# Conflicts:
#	.browserslistrc
#	.eslintrc.js
#	.gitignore
#	README.md
#	babel.config.js
#	jsconfig.json
#	package-lock.json
#	package.json
#	public/index.html
#	src/main.js
#	vue.config.js

Author: linhntaim