Merge branch 'zhangmeng' of http://gitlab.maxrocky.com/visualcloud/Vmatrix-device-start into zhangmeng
