Merge branch 'master' into 'code_smells_iteration_3.2'

iTrust/WebRoot/WEB-INF/web.xml

iTrust/WebRoot/auth/admin/menu.jsp

iTrust/WebRoot/auth/admin/viewTransactionLogs.jsp

iTrust/WebRoot/auth/hcp-patient/messageInbox.jsp

iTrust/WebRoot/auth/hcp-uap/activatePatient.jsp

iTrust/WebRoot/auth/hcp-uap/deactivatePrePatient.jsp

iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientInfo.jsp

iTrust/WebRoot/auth/hcp-uap/viewPreRegisteredPatientList.jsp

iTrust/WebRoot/auth/hcp/menu.jsp

iTrust/WebRoot/auth/hcp/messageInbox.jsp

iTrust/WebRoot/auth/hcp/messageOutbox.jsp

iTrust/WebRoot/auth/patient/menu.jsp

iTrust/WebRoot/auth/patient/messageInbox.jsp

iTrust/WebRoot/auth/patient/messageOutbox.jsp

iTrust/WebRoot/auth/tester/menu.jsp

iTrust/sql/createTables.sql

iTrust/sql/data/patient92.sql

iTrust/src/edu/ncsu/csc/itrust/action/EditPatientAction.java

...t/src/edu/ncsu/csc/itrust/action/EditPersonnelAction.java

...c/edu/ncsu/csc/itrust/action/EditPrescriptionsAction.java