Video sprint23

This is the video team's sprint work fo the last two weeks. All work was done in branches and all branches were code reviewed before being merged into VideoSprint23.