Fixing merge conflicts
Fixing merge conflicts

dclegalhackers/districthousing,adelevie/districthousing,jrunningen/districthousing,codefordc/districthousing,MetricMike/districthousing,lankyfrenchman/dchousing-apps,jrunningen/districthousing,dmjurg/districthousing,jrunningen/districthousing,codefordc/districthousing,uncompiled/districthousing,lankyfrenchman/dchousing-apps,MetricMike/districthousing,lankyfrenchman/dchousing-apps,jrunningen/districthousing,meiao/districthousing,codefordc/districthousing,codefordc/districthousing,adelevie/districthousing,uncompiled/districthousing,dclegalhackers/districthousing,adelevie/districthousing,uncompiled/districthousing,codefordc/districthousing,meiao/districthousing,dmjurg/districthousing,dmjurg/districthousing,uncompiled/districthousing,dmjurg/districthousing,dclegalhackers/districthousing,lankyfrenchman/dchousing-apps,dclegalhackers/districthousing,meiao/districthousing,MetricMike/districthousing,jrunningen/districthousing,MetricMike/districthousing,adelevie/districthousing,uncompiled/districthousing,meiao/districthousing,meiao/districthousing