ready to replace ASI with AFN
merged conflict
fixed a pod build setting file
fixed a warning in IPAddress.c
fixed the mac add bug on second runs