fix sort + order by
fix closed tag of button
Merge branch 'master' of https://github.com/baotran109/qalingo-b2c-web-classic-fo-bo into baotran109-master

Conflicts:
	theme-assets/assets-frontoffice/assets-mcommerce-pages/src/main/resources/velocity/themes/default/www/default/content/catalog/product-line.vm