Merge pull request #24 from ChinaPicture/Sugar

带过来登记管理；骄傲的设置管理；就
123123