update news category
Merge branch 'staging' of https://github.com/dohaibac/Tre_mo_coi into staging
commit category
Merge branch 'staging' of https://github.com/dohaibac/Tre_mo_coi into staging
Merge branch 'staging' of https://github.com/dohaibac/Tre_mo_coi into staging
commit sitebar
Merge branch 'staging' of https://github.com/dohaibac/Tre_mo_coi into staging

Conflicts:
	wp-content/themes/orphans-fd-theme/functions.php
	wp-content/themes/orphans-fd-theme/includes/custom_post_type.php
Merge branch 'staging' of https://github.com/dohaibac/Tre_mo_coi into staging
commit nhap thong tin tre layout
commit nhap tre mo coi
commit nhap tre mo coi
commit nhap tre mo coi
update
Merge branch 'staging' of https://github.com/dohaibac/Tre_mo_coi into staging

Conflicts:
	wp-content/themes/orphans-fd-theme/functions.php
Merge branch 'staging' of https://github.com/dohaibac/Tre_mo_coi into staging
commit
Commit