Merge branch 'master' into staging

# Conflicts:
#	.project
#	src/main/java/org/genesys2/server/service/impl/UserServiceImpl.java
#	src/main/java/org/genesys2/server/servlet/controller/UserProfileController.java
#	src/main/java/org/genesys2/server/servlet/controller/rest/UsersController.java
#	src/main/webapp/WEB-INF/jsp/accession/map.jsp

src/main/java/org/genesys2/server/service/impl/BatchRESTServiceImpl.java

@@ -559,10 +559,6 @@ public class BatchRESTServiceImpl implements BatchRESTService {
 
 	private boolean updateCrop(Accession accession, JsonNode value) throws RESTApiDataTypeException {
 		if (value != null) {
-			if (!value.isTextual()) {
-				throw new RESTApiDataTypeException("cropName must be a String");
-			}
-
 			if (value.isNull()) {
 				if (!StringUtils.equals(null, accession.getCropName())) {
 					accession.setCropName(null);
@@ -571,6 +567,10 @@ public class BatchRESTServiceImpl implements BatchRESTService {
 				}
 			}
 
+			if (!value.isTextual()) {
+				throw new RESTApiDataTypeException("cropName must be a String");
+			}
+
 			final String cropName = value.textValue().trim();
 			if (!StringUtils.equals(cropName, accession.getCropName())) {
 				accession.setCropName(cropName);

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

@@ -763,11 +763,9 @@
     <script type="text/javascript">
 				jQuery(document).ready(function() {
 					var map = L.map('map').setView([${accessionGeo.latitude}, ${accessionGeo.longitude}], 2);
-					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
+					L.tileLayer('http://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}', {
+						attribution: 'Tiles &copy; Esri &mdash; Esri, DeLorme, NAVTEQ',
+						maxZoom: 16
 					}).addTo(map);
 					var marker = L.marker([${accessionGeo.latitude}, ${accessionGeo.longitude}]).addTo(map);
 				});

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

@@ -37,8 +37,8 @@
 
             <ul class="dropdown-menu">
                 <li>
-                    <label class="label-map-provider"><input class="map-provider" value="mapQuest" name="provider" style='margin-right: 10px;margin-left: 5px'
-                                  type='radio'>MapQuest</label>
+<!--                     <label class="label-map-provider"><input class="map-provider" value="mapQuest" name="provider" style='margin-right: 10px;margin-left: 5px'
+                                  type='radio'>MapQuest</label> -->
                     <label class="label-map-provider"><input name="provider" value="openstreetmap" class="map-provider" style='margin-right: 10px;margin-left: 5px'
                                   type='radio'>Openstreetmap</label>
                     <label class="label-map-provider"><input name="provider" value="esriGray" class="map-provider" style='margin-right: 10px;margin-left: 5px'
@@ -133,12 +133,12 @@
                  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>'
                  }),*/
-                mapQuest: L.tileLayer('https://otile{s}-s.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
+                /* mapQuest: 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
-                }),
+                }),*/
                 esriGray: L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}', {
                 	attribution: 'Tiles &copy; Esri &mdash; Esri, DeLorme, NAVTEQ',
                 	maxZoom: 16
@@ -215,9 +215,9 @@
                     topPane.appendChild(mapProviders[cookieUtils.getCookie('mapProviders')].getContainer());
                     mapProviders[cookieUtils.getCookie('mapProviders')].setZIndex(0);
                 } else {
-                    mapProviders.mapQuest.addTo(map);
+                    mapProviders.esriGray.addTo(map);
                     topPane.appendChild(mapProviders[cookieUtils.getCookie('mapProviders')].getContainer());
-                    mapProviders.mapQuest.setZIndex(0);
+                    mapProviders.esriGray.setZIndex(0);
                 }
             });
 

src/main/webapp/WEB-INF/jsp/index.jsp

@@ -205,21 +205,6 @@
 			messages: { noResults: '', results: function() {} },
 			select: function(event, ui) { document.location.pathname='/acn/t/'+ui.item.value; } });
 	});
-	
-/* 	var map = L.map('globalmap', {minZoom:2, maxZoom:2, dragging:false, zoomControl:false, keyboard:false}).setView([20,0], 2);
-	L.tileLayer('https://otile{s}-s.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
-	    attribution: "MapQuest",
-	    styleId: 22677,
-	    noWrap: true,
-	    subdomains: ['1','2','3','4'],
-	    opacity: 0.6
-	}).addTo(map);
-	L.tileLayer("{s}/explore/tile/{z}/{x}/{y}?filter={}", {
-	    attribution: "<a href='${props.baseUrl}'>Genesys</a>",
-	    styleId: 22677,
-	    noWrap: true,
-	    subdomains: [${props.tileserverCdn}]
-	}).addTo(map); */
   });
 </script>
 </content>