Merge branch 'master' into WL

Conflicts:
	PhysicianAssistant.xcodeproj/project.pbxproj

PhysicianAssistant.xcworkspace/xcuserdata/langyi.xcuserdatad/UserInterfa
ceState.xcuserstate

PhysicianAssistant.xcworkspace/xcuserdata/wangliang.xcuserdatad/UserInte
rfaceState.xcuserstate
	PhysicianAssistant/Base.lproj/LaunchScreen.xib
	PhysicianAssistant/Base.lproj/Main.storyboard
	PhysicianAssistant/DataEngine/StoreOnlineNetworkEngine.m
	PhysicianAssistant/LYHospitalList.h
	PhysicianAssistant/LYHospitalList.m
	PhysicianAssistant/SelectCity.h
	PhysicianAssistant/Sign Up/LYGetcodeVC.m
	PhysicianAssistant/Sign Up/LYPasswordVC.m