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

Conflicts:
	components/com_jnt_hanhphuc/views/user_man_order_items/tmpl/default.php
	templates/hanhphuc/css/styles.css