Merge pull request #3 from SuperMeat/master

11291705
1708
1709
1111
Merge branch 'master' of https://github.com/SuperMeat/Baby_Care_Lite_-CN-

Conflicts:
	Parenting/Parenting/WeatherView.m
1.4.0 12021515 更新引导图资源，修改了button
Merge pull request #3 from JammingLin/master

1.4.0 12021515 更新引导图资源，修改了button