Merge branch 'master' into HiBoxde1.0

# Conflicts:
#	创维盒子/双子星云手机.xcodeproj/project.pbxproj
#	创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/Contents.json
#	创维盒子/双子星云手机/Assets.xcassets/AppIcon111.appiconset/隐私.png