Lộc: chỉnh vị trí hàm trong script.js. chỉnh sửa code trong home:product
Merge branch 'master' of https://github.com/minhy/happy-water

Conflicts:
	home/views/common/categories.cfm
Merge branch 'master' of https://github.com/minhy/happy-water