fixes a little bug where the advanced search block gets populated when using edismax
Merge branch '7.x' of git://github.com/Islandora/islandora_solr_search into 7.x
Merge branch '7.x' of git://github.com/Islandora/islandora_solr_search into 7.x
Merge branch '7.x' of git://github.com/Islandora/islandora_solr_search into 7.x
added field permissions and display filtering and updating Solr displays
resolve merge conflict
moved solr_doc restructure out of ::prepareSolrDoc() into a function that can optionally be called from the display class
renamed datastream key and moved watchdog check
added highlighting support
fields that arent explicitly configured never have snippets, so no need to check
Merge pull request #105 from DannyJoris/7.x

7.x