commit
resolve git problem
Merge branch 'staging' of https://github.com/dohaibac/Tre_mo_coi into staging

Conflicts:
	wp-content/themes/orphan-theme-v2/loop-archive.php
	wp-content/themes/orphan-theme-v2/search.php
delete image captcha
commit nhap_thong_tin_tre interface
Merge branch 'staging' of https://github.com/dohaibac/Tre_mo_coi into staging

Conflicts:
	wp-content/themes/orphan-theme-v2/loop-archive.php
cm