Re-add resolution to title of image media
Merge branch 'master' into mediacrush.js

Conflicts:
	templates/fragments/image.html