Merge branch 'V3-V30XX-6060' of http://git.fast-fun.cn:92/RuiLiWuLian/NB_APP_Code into V3-V30XX-6060

# Conflicts:
#	inc/AppConfig.h