adds video, fixes sidenav hover
Merge branch 'master' into video-embed
swtiched order of video and slides in Ss