Removed city duplicate in forms
Merge remote-tracking branch 'origin/remove-city' into development