added functionality to edit city details
changed error showing and model saving
Merge branch 'editBranch'