Merge pull request #3 from nguyen-kiet-mulodo/v1.0.fixbug

Fixbug branch 1.0
Merge branch 'v1.0.fixbug' into my_kiet_branch
Change direct from master branch
Merge branch 'my_kiet_branch' into v1.0.fixbug

Conflicts:
	branch_2_app/customer.php