fix js
Merge remote branch 'upstream/master'
add html + css for Operation Hour
Merge remote branch 'upstream/master'

Conflicts:
	theme-assets/assets-frontoffice/assets-mcommerce-resources/src/main/resources/themes/default/css/qalingo-fo.css
Merge pull request #25 from baotran109/master

fix js