remove extra null check. Format
Merge branch 'master' of https://github.com/mpi2/PhenotypeArchive

# By jwgwarren (11) and others
# Via jwgwarren (2) and others
* 'master' of https://github.com/mpi2/PhenotypeArchive: (23 commits)
  Check in changes to MAIndexer
  Started IndexManager. SangerImagesIndexer has compile issues which Jonathan shall fix as soon as it's checked in.
  use same label for impc_image and image in found messages
  fixed concetanation typo
  added latest_phenotyping_centre as copyField for phenotyping_center field
  added timing to SangerImageIndexer
  Updated MAIndexer to use autowired spring values.
  a finished and working SangerImagesIndexer using solrJ and many many maps
  ditto
  ditto
  ditto
  ditto
  ditto
  changed subtype to list
  removed dupplicate expname
  changed some fields in sangerimages dto to be multivalued
  changed dcf id to String and added hp id and hp term
  Added missing dropdown nav link to Mouse Models section in disease page.
  Added explanatory headers to disease/mouse model sections in disease and gene pages.
  Changed 'Ftp' to 'FTP' in generigpage.tag like srysly Wtf!?
  ...
move the spring dependency injection to superclass
Merge branch 'master' of https://github.com/mpi2/PhenotypeArchive

# By mrelac (4) and jwgwarren (1)
# Via jwgwarren (2) and mrelac (1)
* 'master' of https://github.com/mpi2/PhenotypeArchive:
  Removed unneeded beans from index-app-config.xml at Jeremy's direction. Their presence was causing the compiler to bark that the PhenotypePipelineDAOImpl class didn't exist.
  Refactored DiseaseIndexer to use new run() signature in AbstractIndexer.
  Check in changes to MAIndexer and MPIndexer.
  updated SangerIndexer to cope with multiple alleles for gene
  Check in changes to IndexerMap.

Conflicts:
	src/main/java/uk/ac/ebi/phenotype/solr/indexer/DiseaseIndexer.java
sout json doc for disease