Merge branch 'master' into WL

Conflicts:

PhysicianAssistant.xcworkspace/xcuserdata/wangliang.xcuserdatad/UserInte
rfaceState.xcuserstate
	PhysicianAssistant/Base.lproj/Main.storyboard