Two templates for each media to support different rendering methods (preview | display)
Merge branch 'master' of github.com:sboye/djif