Merge branch 'master' into shib-auth

client/html/user-guide/_images/webclient_tutorial_02_map.jpg

...l/user-guide/_images/webclient_tutorial_03_timeslider.jpg

...er-guide/_images/webclient_tutorial_04_search-results.jpg

...html/user-guide/_images/webclient_tutorial_05_filters.jpg

...l/user-guide/_images/webclient_tutorial_06_map-layers.jpg

client/html/user-guide/_images/wms_cloud-mask.png

client/html/user-guide/_images/wms_cql-filtering.png

client/html/user-guide/_images/wms_custom-bands.png

client/html/user-guide/_images/wms_custom-stretch.png

client/html/user-guide/_images/wms_false-color.png

client/html/user-guide/_images/wms_full.png

client/html/user-guide/_images/wms_masked-clouds.png

client/html/user-guide/_images/wms_ndvi-style.png

client/html/user-guide/_images/wms_qgis1.jpg

client/html/user-guide/_images/wms_qgis2.jpg

client/html/user-guide/_images/wms_qgis3.jpg

client/html/user-guide/_images/wms_qgis4.jpg

client/html/user-guide/_images/wms_quicklook.png

client/html/user-guide/_images/wmts_animation.gif

client/html/user-guide/_images/wmts_full.png