增加用户名添加机制
Merge branch 'master' of https://github.com/smallstone5/SmallStone

Conflicts:
	SmallStone_iOS/SmallStone/GuideViewController.m