merge
Merge branch 'master' of https://github.com/yichiliu/Test_ios

Conflicts:
	Test/Controllers/YCLCustomViewController.m
legacy code cleaning