Merge pull request #85 from ShadowSam/master

Admin page - showing admin status of all users
Merge remote-tracking branch 'upstream/dev'