#331 fixes display area next to video player
Merge branch 'development' into rb/331-video-player
Merge branch 'development' into rb/331-video-player
Fixes specs for SeriesController.
Merge pull request #370 from afred/rb/331-video-player

Rb/331 video player