Merge branch 'MetLife_v5.3' of Common/Utils into dev

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
  - Potential fix for timer disposal on Net Standard
+ - Added workaround for older RPC servers where the typestring being broadcast would stil include _SimplSharp, now will be stripped
 
 ## [3.6.0] - 2018-06-19
 ### Added

ICD.Common.Utils/Json/JsonItemWrapper.cs

@@ -71,6 +71,12 @@ namespace ICD.Common.Utils.Json
 			string itemString = (string)token.SelectToken(ITEM_TOKEN);
 			Type type = Type.GetType(typeString);
 
+			if (type == null)
+			{
+				typeString = typeString.Replace("_SimplSharp", "").Replace("_NetStandard", "");
+				type = Type.GetType(typeString);
+			}
+
 			return JsonConvert.DeserializeObject(itemString, type);
 		}
 	}