Error Code
Merge remote-tracking branch 'origin/master'

Conflicts:
	HaohanITPlayer/public/DVRMVPlayer.h
	HaohanITPlayer/public/DVRMVPlayer.idl