edit article, productre and rename folder
Merge branch 'master' of https://github.com/minhy/happy-water