Align git version of PhenotypeArchive with svn version
Update solr core configuration to include MA core
Merge branch 'master' of https://github.com/mpi2/PhenotypeArchive.git