simpler schema
simpler schemaMerge branch 'master' of https://github.com/InformationIntegrationGroup/dig-solr

Conflicts:
	schema.xml