Refactored for phenotype test. Moved helper test files from 'Test' directory to 'src' directory, as junit treats all source files in the 'test' tree as tests and was barking because the supporting test files had no tests. Moved them to new packages under 'org.mousephenotype.www.testing.
Merge origin/master