edit location loading and popup estate window
Merge pull request #4 from MahyarJ/master

edit location loading and popup estate window