merge dev
video view
video view add