solves issue #92
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	themes/swissbib/templates/RecordDriver/SolrDefault/core.phtml
Merge remote-tracking branch 'upstream/development' into uebersetzungen
Kosmetik