Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

# Conflicts:
#	unimall-data/src/main/java/com/iotechn/unimall/data/domain/CircleFriendsInfo.java