b lah
Merge branch 'master' of https://github.com/mpi2/PhenotypeArchive.git

Conflicts:
	src/test/resources/appConfig.properties