add a api
Merge branch 'master' of https://github.com/mzoneapp/taoatao_android.git
个人主页
Merge branch 'master' of https://github.com/mzoneapp/taoatao_android.git

Conflicts:
	src/im/taoatao/o2o/ui/goods/ActionBarFragmentActivity.java
	src/im/taoatao/o2o/ui/goods/GoodsGridFragment.java
Merge branch 'master' of https://github.com/mzoneapp/taoatao_android.git
12