thien
Merge branch 'master' of https://github.com/minhy/happy-water

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