added GUI for adminitrators and users
resolved conflicts
bug fixed save administrator