1.0.0 08151710
Merge pull request #41 from SuperMeat/master

T08141522
Merge branch 'master' of https://github.com/JammingLin/Baby_Care_CN

Conflicts:
	Parenting/Amoy Baby Care.xcodeproj/project.pbxproj
	Parenting/BabyCalendar/BabyCalendar/MilestoneHeaderView.xib
1.0.0 08161107
1.0.0 08161545
1.0.0 08181451
S08181720
S08181752