add VideoViewController
merge master