deleted patientRegimen patientRegimenCurrent and patientRegimenCompleted jsp pages and DrugSetItem class
Conflicts:
webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimenCompleted.jsp
webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimenCurrent.jsp