完成用户页面 yy
Merge branch 'feature/yy_user' of https://github.com/BluTeam/Fdur into feature/yy_user

Conflicts:
	app/models/user.rb