re #868 - Added streets listbox instead of a plain text field
Merge branch 'feature/868-contacts' into staging
re #868 - Typo
Merge branch 'feature/868-contacts' into staging