同步
Merge branch '把viewcontroller改成view' of https://github.com/HappySL/qwerty into 把viewcontroller改成view

Conflicts:
	SkinLab/ProductView/RecommendDetailViewController.h
	SkinLab/ProductView/RecommendDetailViewController.m