change tabs bug
Merge branch 'master' of github.com:mzoneapp/taoatao_android
change tabs bug
change multi viewpage to single viewpage
bug multi viewpage to single viewpage
search
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml