aaaaa
Merge branch 'master' of https://github.com/hoangducthien/baotri

Conflicts:
	baotri_server/edit_component.php