Merge commit 'be75e80865e9f1406e1e07580c87de2804062ebd' into HiBoxde1.0

# Conflicts:
#	创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm