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

Conflicts:
	.gitignore
	administrator/language/en-GB/en-GB.com_jnt_hanhphuc.sys.ini
	configuration.php
	templates/hanhphuc/css/styles.css