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

Fixbug
Create conflict on master
Merge branch 'v1.0.fixbug' into my_kiet_branch

Conflicts:
	branch_2_app/about.php
Fix conflict on fixbug
Fix confilct