Test revert

Test
no message
Merge origin/master
Merge vule
Merge branch 'master' of https://github.com/cumga007/codeandmore_github

Conflicts:
	congnguyentan.php