image with holder.js, remove author
Merge branch 'master' of https://github.com/cwilhelm/tvz-templates

Conflicts:
	tvz_templates/templates/cmsplugin_filer_image/image.html