Merge pull request #230 from salihkardan/two-dot-o

Do not allow admin user to see other users' AWS credential infromation
Merge remote-tracking branch 'upstream/two-dot-o' into two-dot-o