Merge pull request #1 from Yannyezixin/master

用户系统, 栏目，标签功能