Adds controls to video player
Merge branch 'fix/video-controls' into develop

* fix/video-controls:
  Adds controls to video player