Merge branch 'master' into shib-auth

...mentation/user-guide/images/webclient_timeslider-dots.jpg

...ntation/user-guide/images/webclient_timeslider-toggle.jpg

...tion/user-guide/images/webclient_toggle-search-single.jpg

documentation/user-guide/images/webclient_toggle-search.jpg

...mentation/user-guide/images/webclient_tutorial-button.jpg

...ntation/user-guide/images/webclient_tutorial_01_start.jpg

...mentation/user-guide/images/webclient_tutorial_02_map.jpg

...on/user-guide/images/webclient_tutorial_03_timeslider.jpg

...ser-guide/images/webclient_tutorial_04_search-results.jpg

...ation/user-guide/images/webclient_tutorial_05_filters.jpg

...on/user-guide/images/webclient_tutorial_06_map-layers.jpg

documentation/user-guide/images/wms_cloud-mask.png

documentation/user-guide/images/wms_cql-filtering.png

documentation/user-guide/images/wms_custom-bands.png

documentation/user-guide/images/wms_custom-stretch.png

documentation/user-guide/images/wms_false-color.png

documentation/user-guide/images/wms_full.png

documentation/user-guide/images/wms_masked-clouds.png

documentation/user-guide/images/wms_ndvi-style.png

documentation/user-guide/images/wms_qgis1.jpg