Merge commit 'd54659b8f755250fe1f7cbe37ddb7461c9f90c88' into develop

* commit 'd54659b8f755250fe1f7cbe37ddb7461c9f90c88':
  Release/v1.4.2 (#772)
  Release/v1.4.1 (#682)

# Conflicts:
#	sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Scripts/TextMeshOutline.cs
#	sdkproject/Assets/Mapbox/Examples/Scripts/UpdateMapWithLocationProvider.cs
#	sdkproject/Assets/Mapbox/Unity/DataContainers/TileJsonData.cs
#	sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/VectorLayerPropertiesDrawer.cs
#	sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProviderAndroidNative.cs
#	sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/HeightModifier.cs
#	sdkproject/ProjectSettings/ProjectSettings.asset

Author: abhishektrip

sdkproject/Assets/Mapbox/Examples/1_DataExplorer/Scripts/TextMeshOutline.cs

@@ -88,4 +88,4 @@ Vector3 GetOffset(int i)
 			}
 		}
 	}
-}
+}

sdkproject/Assets/Mapbox/Examples/Scripts/UpdateMapWithLocationProvider.cs

@@ -33,7 +33,7 @@ public class UpdateMapWithLocationProvider : MonoBehaviour
 
 		private void Awake()
 		{
-			// Prevent double initialization of the map.
+			// Prevent double initialization of the map. 
 			_map.InitializeOnStart = false;
 		}
 
@@ -111,4 +111,4 @@ void LateUpdate()
 			}
 		}
 	}
-}
+}

sdkproject/Assets/Mapbox/Unity/DataContainers/TileJsonData.cs

@@ -54,7 +54,7 @@ public void ProcessTileJSONData(TileJSONResponse tjr)
 		{
 			tileJSONLoaded = true;
 			List<string> layerPropertiesList = new List<string>();
-			// Un-comment if required. Throws a warning right now.
+			// Un-comment if required. Throws a warning right now. 
 			//List<string> sourceLayersList = new List<string>();
 
 			if (tjr == null || tjr.VectorLayers == null || tjr.VectorLayers.Length == 0)
@@ -187,4 +187,4 @@ public void ProcessTileJSONData(TileJSONResponse tjr)
 			}
 		}
 	}
-}
+}

sdkproject/Assets/Mapbox/Unity/Editor/PropertyDrawers/VectorLayerPropertiesDrawer.cs

@@ -91,7 +91,7 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
 
 			ShowSepartor();
 
-			//Draw Feature section.
+			//Draw Feature section. 
 			ShowFeatures = EditorGUILayout.Foldout(ShowFeatures, "FEATURES");
 			if (ShowFeatures)
 			{

sdkproject/Assets/Mapbox/Unity/Location/DeviceLocationProviderAndroidNative.cs

@@ -13,7 +13,7 @@ public class DeviceLocationProviderAndroidNative : AbstractLocationProvider, IDi
 
 
 		/// <summary>
-		/// The minimum distance (measured in meters) a device must move laterally before location is updated.
+		/// The minimum distance (measured in meters) a device must move laterally before location is updated. 
 		/// https://developer.android.com/reference/android/location/LocationManager.html#requestLocationUpdates(java.lang.String,%20long,%20float,%20android.location.LocationListener)
 		/// </summary>
 		[SerializeField]
@@ -304,7 +304,7 @@ private void populateCurrentLocation(AndroidJavaObject location)
 			// Otherwise it is set to '0.0'
 			// https://developer.android.com/reference/android/location/Location.html#getBearing()
 			// We don't want that when we rotate a map according to the direction
-			// thes user is moving, thus don't update 'heading' with '0.0'
+			// thes user is moving, thus don't update 'heading' with '0.0' 
 			if (!hasBearing)
 			{
 				_currentLocation.IsUserHeadingUpdated = false;
@@ -329,7 +329,7 @@ private void populateCurrentLocation(AndroidJavaObject location)
 				|| timestampUpdated
 				|| speedUpdated;
 
-			// Un-comment if required. Throws a warning right now.
+			// Un-comment if required. Throws a warning right now. 
 			//bool networkEnabled = _gpsInstance.Call<bool>("getIsNetworkEnabled");
 			bool gpsEnabled = _gpsInstance.Call<bool>("getIsGpsEnabled");
 			if (!gpsEnabled)

sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs

@@ -745,7 +745,7 @@ public void SpawnPrefabAtGeoLocation(GameObject prefab,
 		/// Places the prefab for supplied categories.
 		/// </summary>
 		/// <param name="prefab">GameObject Prefab</param>
-		/// <param name="categories"><see cref="LocationPrefabCategories"/> For more than one category separate them by pipe
+		/// <param name="categories"><see cref="LocationPrefabCategories"/> For more than one category separate them by pipe 
 		/// (eg: LocationPrefabCategories.Food | LocationPrefabCategories.Nightlife)</param>
 		/// <param name="density">Density controls the number of POIs on the map.(Integer value between 1 and 30)</param>
 		/// <param name="locationItemName">Name of this location prefab item for future reference</param>

sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/MeshModifiers/HeightModifier.cs

@@ -33,7 +33,7 @@ public static MinMaxPair GetMinMaxHeight(List<Vector3> vertices)
 
 	/// <summary>
 	/// Height Modifier is responsible for the y axis placement of the feature. It pushes the original vertices upwards by "height" value and creates side walls around that new polygon down to "min_height" value.
-	/// It also checkes for "ele" (elevation) value used for contour lines in Mapbox Terrain data.
+	/// It also checkes for "ele" (elevation) value used for contour lines in Mapbox Terrain data. 
 	/// Height Modifier also creates a continuous UV mapping for side walls.
 	/// </summary>
 	[CreateAssetMenu(menuName = "Mapbox/Modifiers/Height Modifier")]
@@ -85,7 +85,7 @@ public override void Run(VectorFeatureUnity feature, MeshData md, UnityTile tile
 			minHeight = minHeight * _options.extrusionScaleFactor * _scale;
 			height = (maxHeight - minHeight);
 
-			//Set roof height
+			//Set roof height 
 			GenerateRoofMesh(md, minHeight, maxHeight);
 
 			GenerateWallMesh(md);