problem with video no-flexbox behaviour fixed
Merge branch 'feature'