Edited variable names for AddOrEditUserFrame
changed: UserID to userID
Merge origin/master
Merge origin/master
variable names changes and some implementation