Update user content
Merge branch 'master' of https://github.com/ngxuanmui/hanhphuc.vn.git

Conflicts:
	components/com_jnt_hanhphuc/views/articles/tmpl/default.php