Change style for allocation
Merge remote-tracking branch 'origin/master'

Conflicts:
	user_account/customer/allocation/qry_allocation.php
	user_account/customer/templates/default/dsp_order_all_allocation.tpl
Thêm template cho khách hàng. -- Sky.
dang chinh sua lai bang phan phoi.
Merge remote-tracking branch 'origin/master'

Conflicts:
	user_account/customer/templates/default/dsp_allocation_script.tpl