gallery fix
Merge branch 'dev'

Conflicts:
	app/views/images/_image_list.html.erb