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.
[BIOCAT-905 / BIOCAT-908] Added support for ontology namespaced tags.
[BIOCAT-906] Removed the page parameter for when the user changes the number of results per page
[BIOCAT-901] Fixed the script to generate search suggestions
Small style change for search_options class.
Fix for BIOCAT-914: back to all tag results not working when tag belongs to ontology. Added the name of scope to next pages of results.
Small style change for back to results buttons.
Merge branch 'search'
Merge branch 'biocat-master' into biovel-master