1
Merge branch 'master' of github.com:mzoneapp/taoatao_android

Conflicts:
	src/im/taoatao/o2o/ui/goods/CreateGoodsFragmentActivity.java