Add User#admin attribute for the PIP (People In Power :P)
This and that
Merge remote-tracking branch 'origin/master' into staging