Add push/pull fix for content block media display
Merge branch 'master' of github.com:kreativkombinat/atx