Added user/group management back, fixed some add/update window framework stuff, started with acl again