Merge pull request #642 from sexnothing/user

Comment style fixed
Merge remote-tracking branch 'upstream/user' into user
User activity custom