12
Merge branch 'master' of https://github.com/mzoneapp/taoatao_android.git

Conflicts:
	src/im/taoatao/o2o/MyApplication.java