add more and settings
Merge branch 'master' of github.com:zhudong/BLSales

Conflicts:
	bin/BLSales.apk
	bin/classes.dex
	bin/classes/com/pactera/blsales/R$drawable.class
	bin/classes/com/pactera/blsales/R$id.class
	bin/classes/com/pactera/blsales/R$layout.class
	bin/classes/com/pactera/blsales/R$menu.class
	bin/classes/com/pactera/blsales/R$string.class
	bin/classes/com/pactera/blsales/R$style.class
	bin/classes/com/pactera/blsales/activity/MainActivity.class
	bin/classes/com/pactera/blsales/activity/PersonalActivity.class
	bin/classes/com/pactera/blsales/activity/PersonalMyCollectActivity.class
	bin/classes/com/pactera/blsales/activity/PersonalMyGetActivity.class
	bin/classes/com/pactera/blsales/activity/ProductDetailActivity.class
	bin/classes/com/pactera/blsales/adapter/ProductsAdapter.class
	bin/classes/com/pactera/blsales/fragment/ProductsFragment.class
	bin/classes/com/pactera/blsales/fragment/SearchResultFragment.class
	bin/resources.ap_
	gen/com/pactera/blsales/R.java