make conflict on fixbug branch
Merge branch 'v1.0.fixbug' into my_kiet_branch

Conflicts:
	branch_2_app/about.php