QuangMinh edited activity_search.xml
merge dev_quangminhs