Fix merge conflicts.
Fix merge conflicts.

CodeForBrazil/streetmix,magul/streetmix,kodujdlapolski/streetmix,kodujdlapolski/streetmix,codeforamerica/streetmix,magul/streetmix,codeforamerica/streetmix,CodeForBrazil/streetmix,macGRID-SRN/streetmix,kodujdlapolski/streetmix,CodeForBrazil/streetmix,codeforamerica/streetmix,macGRID-SRN/streetmix,macGRID-SRN/streetmix,magul/streetmix