11.24 21:40 miao

2014.11.24
 1.loading效果修改。
 2.图片详情页修改。
1
Merge branch 'dev-miao' into dev

Conflicts:

MyPetty.xcodeproj/project.xcworkspace/xcuserdata/Mcl.xcuserdatad/UserInt
erfaceState.xcuserstate

MyPetty.xcodeproj/xcuserdata/Mcl.xcuserdatad/xcdebugger/Breakpoints_v2.x
cbkptlist
	MyPetty/Log.h
	ViewControllers/基类/随机/MyStarViewController.m
	ViewControllers/基类/随机/PetRecommendViewController.m