phan tromg email em da bao cao
Merge remote-tracking branch 'origin/master'

Conflicts:
	user_account/customer/templates/default/dsp_allocation_script.tpl
fix loi trung javascript + trung ten xu ly + khong vao allocation duoc
Merge remote-tracking branch 'origin/master'

Conflicts:
	user_account/customer/allocation/index.php
Merge remote-tracking branch 'origin/master'