2013-06-19 additions
Merge branch 'master' of github.com:Universiteitsbibliotheek/Lludss-Solr

Conflicts:
	solr/conf/schema.xml