User list Update, Admins
Merge remote-tracking branch 'upstream/master'
somewhat working stuff