More dl4 things
Thumbs
Changed a font thing
Merge branch 'Joe2'

Conflicts:
	app/static/img/Thumbs.db