搭建User界面+统一保存storage+圆形头像
Merge branch 'master' of https://github.com/mushanshitiancai/Yuan-Is-No-Say

Conflicts:
	AndroidManifest.xml