add back external-test profile
manually add Jules' changes from the previous POM
Merge branch 'fixedNewDesign' of
https://github.com/mpi2/PhenotypeArchive.git into fixedNewDesign

Conflicts:
	pom.xml