Added 5 default users to the list of all users.
Merge remote-tracking branch 'origin/master'