Merge pull request #15 from JammingLin/master

1.0.0 02211115
02280912 FixBug
Temp 02280919
Temp 02280921
Temp 02280925
1.0.0 02290954
Merge branch 'master' of https://github.com/SuperMeat/Baby_Care_CN

Conflicts:
	Parenting/Parenting/ASIHTTPController/ASIHTTPController.m
	Parenting/Parenting/DataBase.m
Merge branch 'SuperMeat-master'

Conflicts:
	Parenting/Amoy Baby
Care.xcodeproj/project.xcworkspace/xcuserdata/vlll00.xcuserdatad/UserInt
erfaceState.xcuserstate
	Parenting/Parenting/DataBase.m