update video view
merge changes

Conflicts:
	nbproject/private/private.xml
Merge branch 'master' of https://github.com/pengan1987/videoproj