Use correct outputFormat for JSON in CQL format example (see #855)
Merge pull request #1253 from bartvde/jsonp-example

Use correct outputFormat for JSON in CQL format example (see #855)
SLD symbolizers: Support optional geometry element
Removed dangling whitespace.
Merge pull request #1254 from buehner/sld-geometry-aware-symbolizers

SLD geometry aware symbolizers (r=@marcjansen,@bartvde)