Merge branch 'master' of https://github.com/baotran109/qalingo-b2c-web-classic-fo-bo

Conflicts:
	theme-assets/assets-frontoffice/assets-mcommerce-pages/src/main/resources/velocity/themes/default/www/default/layout/default.vm