Added two new tests: PhenotypeAssociationsTest and PhenotypePageStatistics.
Fixed MPII-749, "Gene & Pheno pages: procedure / parameter is ambiguous" by changing the separator between the procedure and the parameter from a forward slash (which is sometimes part of the procedure and/or parameter data) to the 'OR' (vertical) bar. Also added 'provided' dependency to the pom for javax.servlet to eliminate the 'SimpleJspServlet not found' warning at the top of each jsp.
Merge origin/master