added back some stuff
Merge branch 'master' of https://github.com/hydroshare/django-dublincore