Fixbug
Merge branch 'my_kiet_branch' into v1.0.fixbug

Conflicts:
	branch_2_app/customer.php
Merge pull request #4 from nguyen-kiet-mulodo/v1.0.fixbug

Fixbug