Merge branch 'master' of https://github.com/RayZhang/EquipmentInfo

Conflicts:
	UIDevice+CoreTelephonyCategory.m
Update UIDevice+CoreTelephonyCategory

Update UIDevice+CoreTelephonyCategory