categoryView ui ok
Merge remote-tracking branch 'origin/五月的晴天闪了脖子' into 选择树洞功能

Conflicts:
	SDStoryboard.storyboard
	shudong/SDMainTableViewController.m