minor fix for setting thumbnails
attempt to fix edit when there is a reusable object
fixes for metadata edit controls
Merge branch 'geocat_1.1.x_stable' into geocat_1.1.x