Merge branch 'master' into staging

* master:
  Use MapQuest as default worldmap

src/main/webapp/WEB-INF/jsp/accession/map.jsp

@@ -143,22 +143,22 @@
             });
 
 			var map = L.map('map').setView([20,0], 2);
-/* 			L.tileLayer('https://otile{s}-s.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
+ 			L.tileLayer('https://otile{s}-s.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
 			    attribution: "MapQuest",
 			    styleId: 22677,
 			    subdomains: ['1','2','3','4'],
 			    opacity: 0.6
 			}).addTo(map);
- */
+
 			/* L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
 				attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
 			}).addTo(map);
   */
-		  var OpenMapSurfer_Grayscale = L.tileLayer('http://openmapsurfer.uni-hd.de/tiles/roadsg/x={x}&y={y}&z={z}', {
+		  /* var OpenMapSurfer_Grayscale = L.tileLayer('http://openmapsurfer.uni-hd.de/tiles/roadsg/x={x}&y={y}&z={z}', {
 		  	maxZoom: 19,
 		  	attribution: 'Imagery from <a target="_blank" href="http://giscience.uni-hd.de/">GIScience Research Group, University of Heidelberg</a>, Map data &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
 		  }).addTo(map);
-  
+   */
  			L.tileLayer("{s}/explore/tile/{z}/{x}/{y}?filter=" + '${jsonFilter}', {
 			    attribution: "Accession localities from <a href='${props.baseUrl}'>Genesys PGR</a>",
 			    styleId: 22677,