Modified questionform
Merge branch 'master' of https://github.com/minhy/happy-water
modified articleform,article_detail and multiform