8.22 19:49 miao
Merge branch 'dev' of https://github.com/miaocuilin/MyPetty2 into miao-dev

Conflicts:
	MyPetty/AppDelegate.m
	MyPetty/MyPetty-Prefix.pch
Merge branch 'miao-dev' into dev