add all users and current user
Merge origin/master