update merchant list page
Merge branch 'master' of https://github.com/withitergroup/quhao

Conflicts:
	modules/android/Quhao/res/layout/merchant_list_item.xml