I guess we have some more data-object-thumbnail checking to do...
I guess we have some more data-object-thumbnail checking to do...

Conflicts:

	app/models/data_object.rb

kidaa/eol,kidaa/eol,DanielZhangQingLong/eol4,kidaa/eol,DanielZhangQingLong/eol4,DanielZhangQingLong/eol4,DanielZhangQingLong/eol4,DanielZhangQingLong/eol4,kidaa/eol