Fix typo in ui tests
Merge branch 'release'
Support term substitutions (like "Resource" -> "Watershed Solution")

* Global context gets `term` dictionary with text substitutions
* Reference using the desired term variant (title/lower case; singular/plural), e.g. `term.Resource`, `term.Resources`, `term.resource`, term.`resources`
* Current substituable terms are "Resource" and "Resources" (but we can add more if we want)
* Replace all uses of e.g. "Watershed Solution" with e.g. `{{ term.Resource }}`
Properly handle colleciton UDF fields in API

The instance info API was crashing for instances with collection UDF
fields (stewardship)
Add a comma between plot count and resource count

... by moving logic from the template to the view
Merge pull request #1273 from jwalgran/fix/api-collection-udfs

Properly handle colleciton UDF fields in API
Merge pull request #1272 from RickMohr/custom-terminology

Support term substitutions (like "Resource" -> "Watershed Solution")
Make REPLACEABLE_TERMS discoverable by translators
Fix ecobenefits footer message

* Use `instance.supports_resources` instead of `instance.stores_plot_only`
* Eliminate space before period in common case of no resources.
Merge pull request #1274 from RickMohr/fix-eco-footer-message

Fix ecobenefits footer message
Simplify signature of `context_dict_for_plot`

* Remove unused argument `supports_eco` (according to Adam this optimization is now implemented lower down)
* Pass `request` instead of `instance` and `user`
Adjust templates to include/exclude the right things for resources

* Include photo container so page layout doesn't look funny (resource photos coming in a future PR)
* Include progress bar and audit wells
* Exclude "nearby trees" (discussed with Deb; nearby resources are visible on the little map)
* Exclude comment message (the one about not serving as a way to report problems with a tree)
Support progress bar for resources

Also hoist some generic code out of `context_dict_for_plot`
Show recent edits for resources

* Refactor `_plot_audits` to support resource audits
* Use resource class's display name in "short description" of audit
lint from previous PR
Fix error revealed by unit tests
Revert change checked in by mistake
One more unit test fix
Don't fail to start if BING_API_KEY is not defined
Merge pull request #1275 from RickMohr/resource-detail-sidebar

Resource detail sidebar