Merge branch 'hotfix/1.5.1'
Merge branch 'release/1.6.0'
fix small bug in RDFa collection description (about uri as resource instead of literal)
Merge branch 'release/1.7.0'
Merge branch 'hotfix/1.6.1' into develop

Conflicts:
	CHANGELOG.rst
	findingaids/__init__.py
set version to 1.7.1
rdfa bugfix that was initially started as a fix for 1.6
corrections to itemid_to_dao script based on issues found in production
Merge branch 'hotfix/1.7.1' into develop
bump dev version to 1.8.0-dev after tagging 1.7.1