debbugged user creation
Display Modal to select Estates
Merge remote-tracking branch 'upstream/master'