now displaying city and posting date on ads in search (need to drop DB or manually adjust postingDateFormatted in ads)
fixed merge conflicts