添加商品清单页面
Merge branch 'master' of https://github.com/sunnyfarmer/SFTools

Conflicts:
	SFPeddlers/AndroidManifest.xml