Merge branch 'UC100' into 'master'

iTrust/.classpath

iTrust/.project

iTrust/.settings/org.eclipse.jdt.apt.core.prefs

iTrust/.settings/org.eclipse.jdt.core.prefs

iTrust/DBBuilder.launch

iTrust/TestDataGenerator.launch

iTrust/WebRoot/auth/patient/cancelApptPatient.jsp

iTrust/WebRoot/auth/patient/editApptPatient.jsp

iTrust/WebRoot/auth/patient/menu.jsp

iTrust/WebRoot/auth/patient/viewMyApptsPatient.jsp

...est/edu/ncsu/csc/itrust/selenium/EditApptPatientTest.java

...u/csc/itrust/unit/action/CancelApptPatientActionTest.java

...csu/csc/itrust/unit/action/EditApptPatientActionTest.java

iTrust/tests.launch