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

Conflicts:
	Cosmetology/src/UI/ViewController/AddMainCatalogViewController.m
	Cosmetology/src/UI/ViewController/AddSubCatalogViewController.m
	Cosmetology/src/UI/ViewController/EditSubProductViewController.m