Merge pull request #16 from thatcoderguy/master

Merge changes.
Passwords only shown to those who have access + started on password order and user list.
Merge pull request #18 from widagroup/master

Passwords only shown to those who have access + started on password order and user list.