fixed thumb display extension issue
Merge branch 'displaying-pictures'

Conflicts:
	app/assets/javascripts/application.js