Config changes
Solr config for Turina and ensayos
Minor updates, due to spreading out of code.
Merge branch '6.x' of digital.march.es:/var/www/html/drupal/sites/all/modules/islandora_fjm/ into 6.x

Conflicts:
	etc/solr/conf/solrconfig.xml - turina and merce rqs got mixed up...  to be deprecated, anyhow.
Change Solr query function slightly...

...  Should be deprecated anyway...
Fix solr function.
encoding issue in cron job