Merge branch 'development' into osc
* Merklisten Templates
* Übersetzungen save-Template Merklisten
* CSS-Anpassung ul
Merge branch 'osc' into development
Merge branch 'development' of github.com:swissbib/sbvf2 into development

Conflicts:
	local/languages/de.ini
	local/languages/en.ini
	local/languages/fr.ini
	local/languages/it.ini
* conflicts resolved