Merge branch 'master' into development
Added video JS contrib module
Added video-js filter module
Merge branch 'development'