xong delete
Merge branch 'master' of https://github.com/nguyen-phuoc-mulodo/TimChoi

Conflicts:
	Source/ci/application/models/location_model.php