some change
Merge branch 'dev' of git://github.com/loggerhead/wutong into dev
增加个人设置，小组设置