none
Merge branch 'master' of github.com:zhudong/BLSales
add search
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/adapter/HomeGalleryAdapter.class
	bin/classes/com/pactera/blsales/adapter/IndexAdapter.class
	bin/classes/com/pactera/blsales/fragment/HomeFragment.class
	bin/classes/com/pactera/blsales/fragment/PersonalFragment.class
	bin/resources.ap_
	gen/com/pactera/blsales/R.java
	res/values/strings.xml