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

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