更新代码
Merge branch 'master' of https://github.com/kiao295338444/cosmetology

Conflicts:
	Cosmetology/src/UI/ViewController/PhotoWall/PhotoScrollViewController.m