Merge branch 'UC14' into 'master'

iTrust/sql/data/hcp_additional_diagnosis_data.sql

iTrust/sql/data/hcp_diagnosis_data.sql

iTrust/sql/data/malariaEpidemic1.sql

iTrust/sql/data/malariaEpidemic2.sql

iTrust/sql/data/malariaEpidemic3.sql

...ncsu/csc/itrust/action/ViewDiagnosisStatisticsAction.java

iTrust/src/edu/ncsu/csc/itrust/dao/mysql/DiagnosesDAO.java

...ncsu/csc/itrust/selenium/ViewDiagnosisStatisticsTest.java

...itrust/unit/action/ViewDiagnosisStatisticsActionTest.java

...u/ncsu/csc/itrust/unit/charts/DiagnosisTrendDataTest.java

...ncsu/csc/itrust/unit/dao/officevisit/OVDiagnosesTest.java

...csu/csc/itrust/unit/datagenerators/TestDataGenerator.java