Custom error page for Solr Syntax error
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/src/main/java/uk/ac/ebi/atlas/search/BioentitiesSearchController.java
Merge remote-tracking branch 'origin/master'