update video view
merge changes

Conflicts:
	nbproject/private/private.xml