Properly handle colleciton UDF fields in API

The instance info API was crashing for instances with collection UDF
fields (stewardship)
Merge pull request #1273 from jwalgran/fix/api-collection-udfs

Properly handle colleciton UDF fields in API
Refactor: use inline edit form's `inEditModeProperty` to show/hide "Add Tree" button
UI to support resolving alerts

* Collection UDF tables get an extra final column for buttons (e.g. "+" and "Resolve")
* When entering "Edit" mode on plot detail page, add "Resolve" buttons on unresolved "Alerts" rows
Use 'Yes' / 'No' instead of 'True' / 'False' to display boolean values
Merge pull request #1280 from RickMohr/add-alerts-udf

Plot detail: UI to support resolving alerts
Merge pull request #1282 from RickMohr/display-yes-no

Use 'Yes' / 'No' instead of 'True' / 'False' to display boolean values
In tests fetching plot detail, specify `instance` argument to `make_request`

I updated some of the plumbing which creates the context dict for plots to use `request.instance` rather than passing `instance` separately. So tests which constructed their own requests were breaking.
Do display "new point marker" for first marker in list (since polygon is closed)
Merge pull request #1283 from RickMohr/fix-django-tests

In tests fetching plot detail, pass `instance` argument to `make_request`
Distinguish between next/prev marker and next/prev point

* When getting next/prev marker, look in `_markers`
* When getting next/prev point, look in `latlngs()`
Merge pull request #1284 from RickMohr/polygon-editing-fixes

Distinguish between next/prev marker and next/prev point
In display filters, show resource types lower case and plural
Merge pull request #1286 from RickMohr/fix-display-filter-names

In display filters, show resource types lower case and plural
Change ecobenefit labels

* Change title in header from "Yearly Eco Benefits" to "Eco Benefits"
* "Total Benefits" should be renamed "Total Annual Benefits." Move it above the General Eco Benefits Header. This number is all the annual benefits generated by both trees and watershed solutions. It's everything but carbon dioxide stored to date.
* Rename "General Eco Benefits" to "Tree Benefits."
* Get rid of the word "Benefits" that's used for each individual benefit header. Change to desired wording and order.
Add support for pluggable rule sets
Add rules for normal django comments
Add rules for San Diego
Merge pull request #1285 from OpenTreeMap/topic/add-sd-to-importer

Topic/add sd to importer
Fixup option conflict and import error