Merge remote-tracking branch 'upstream/user' into user
Merge remote-tracking branch 'upstream/user' into user
Added translation for config edit
Fix uclient
Merge remote-tracking branch 'upstream/user' into user
Removed user name from persist
Merge pull request #664 from sexnothing/user

Comment style bug fixed
Updated uclient profile url
Merge branch 'user' of https://github.com/pi-engine/pi into user
Merge pull request #665 from liuchuangww/user

User
Fix for uclient login/logout url
Merge branch 'user' of https://github.com/pi-engine/pi into user
Fix for client avatar size
Merge from liaowei
Fix for comment login redirect
Fix redirect
Merge pull request #671 from liuchuangww/user

Fix redirect
Fix redirect
Merge pull request #672 from liuchuangww/user

Fix redirect
Merge remote-tracking branch 'upstream/user' into user