updated for Omeka 2

merged changes from Daniel_KM