Merge branch 'master' of http://172.16.1.23:6688/r/~cjl/HDLLinphoneSDK_IOS

# Conflicts:
#	Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK.csproj