Merge branch 'master' of http://10.1.235.20:3000/ipu/ios-share

# Conflicts:
#	IPUCommon/IPUBaiduMap1.framework/_CodeSignature/CodeResources