update
Merge branch 'master' of https://github.com/kiao295338444/cosmetology

Conflicts:
	Cosmetology.xcodeproj/project.pbxproj

Cosmetology.xcodeproj/project.xcworkspace/xcuserdata/mijie.xcuserdatad/U
serInterfaceState.xcuserstate

Cosmetology.xcodeproj/xcuserdata/mijie.xcuserdatad/xcdebugger/Breakpoint
s.xcbkptlist
	Cosmetology/src/UI/ViewController/EditMessageViewController.m