22的bug
Merge branch 'master' of https://github.com/zhengcq888/Donghua
111的bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	Donghua/src/main/java/com/zcq/donghua/MainActivity.java