Merge remote-tracking branch 'origin/master'

Conflicts:
	cfiXMLApp/cfiXML_API/Utils.cs
	cfiXMLApp/cfiXML_API/cfiXML_Enums.cs
	cfiXMLApp/cfiXML_API/cfiXML_Handler.cs
	cfiXMLApp/cfiXML_API/cfiXML_Handler_Methods.cs