Merge pull request #660 from liuchuangww/user

Clear user notice
Merge remote-tracking branch 'upstream/user' into user
Fix for comment category management
Merge branch 'user' of https://github.com/pi-engine/pi into user
Code cleaning up
Text correction
Merge pull request #661 from liuchuangww/user

Clear notice
Message style bug fixed
Merge pull request #662 from sexnothing/user

Message style bug fixed
Comment style bug fixed
Merge pull request #663 from sexnothing/user

Comment style bug fixed
Merge remote-tracking branch 'upstream/user' into user
Added translation for config edit
Fix uclient
Merge remote-tracking branch 'upstream/user' into user