build

fxi the build errors
merge

Conflicts:
	HaohanITPlayer/DVRPlayer_2010.vcxproj
	HaohanITPlayer/public/DVRMVPlayer.h