fix #7
fix #2
fix #7
fix #7
Merge branch 'master' of https://github.com/libis/Heron-Omeka.git