test

test
Add by cwb-No.1
Merge pull request #1 from JammingLin/master

v1.4.0删除sharesdk2.5.1 更新jpushsdk
1.3.3 verson by cwb edit
1.4 verson by cwb edit
Merge branch 'Branch-PRESENT' of https://github.com/SuperMeat/Baby-Care-Lite-CN- into Branch-PRESENT
Merge branch 'pr/2'

Conflicts:
	Parenting/Amoy Baby Care.xcodeproj/project.pbxproj
	Parenting/Amoy Baby
Care.xcodeproj/project.xcworkspace/xcuserdata/vlll00.xcuserdatad/UserInt
erfaceState.xcuserstate
	Parenting/Parenting/Amoy Baby Care-Prefix.pch
	Parenting/Parenting/SummaryViewController.m
	Parenting/Parenting/defaultAppDelegate.m