including image block formatting changes and video block formatting changes along with a fix for video block controller to use File alias for the static file function call works
Merge branch 'master' of https://github.com/concrete5/concrete5-5.7.0