added households and residents to the webview
resolved conflict
household maps
Merge branch 'master' of https://github.com/LDLN/landline-server