Sorted out the pagination for tags/show page and repositioned the 'search options' box
Merge branch 'search' of github.com:myGrid/biocatalogue into search

# By Aleksandra Nenadic
# Via Aleksandra Nenadic
* 'search' of github.com:myGrid/biocatalogue:
  Fixes for BIOCAT-898 and BIOCAT-899: 'Next page of results' and 'Back to all results' buttons on the search page now preserve the 'include archived' parameter.
  Added a new line of config for solr.
  Revert to 34563624dcf8303539ce85fb584ea510584458a2 to temporary remove the unfinished search by tag pages.

Conflicts:
	app/views/tags/show.html.erb
Re-added some changes that were lost when merging.