Merge tag '0.8.5' into develop

Released-0.8.5 0.8.5
set overview arguments to template, improved localization handling of the content mapper
bumped version
Merge branch 'release/0.8.6'