Merge branch 'nehas'

Conflicts:
	WebContent/CommitteeMember.xml
	WebContent/DeleteDepartment.xml
	WebContent/DeleteStudent.xml
	WebContent/Department.xml
	WebContent/Department.xsd
	WebContent/Event.xml
	WebContent/ModifyDepartment.xml
	WebContent/ModifyStudent.xml
	WebContent/Photographs.xml
	WebContent/Photographs.xsd
	WebContent/RGroup.xml
	WebContent/Student.xml
	WebContent/Student.xsd
	WebContent/XML/CommitteeMember.xml
	WebContent/XML/DeleteDepartment.xml
	WebContent/XML/DeleteStudent.xml
	WebContent/XML/Department.xml
	WebContent/XML/Event.xml
	WebContent/XML/ModifyDepartment.xml
	WebContent/XML/ModifyStudent.xml
	WebContent/XML/Photographs.xml
	WebContent/XML/RGroup.xml
	WebContent/XML/Student.xml
	WebContent/XSD/Department.xsd
	WebContent/XSD/Photographs.xsd
	WebContent/XSD/Student.xsd
	WebContent/xmlFiles/CommitteeMember.xml
	WebContent/xmlFiles/DeleteDepartment.xml
	WebContent/xmlFiles/DeleteStudent.xml
	WebContent/xmlFiles/Department.xml
	WebContent/xmlFiles/Department.xsd
	WebContent/xmlFiles/Event.xml
	WebContent/xmlFiles/ModifyDepartment.xml
	WebContent/xmlFiles/ModifyStudent.xml
	WebContent/xmlFiles/Photographs.xml
	WebContent/xmlFiles/Photographs.xsd
	WebContent/xmlFiles/RGroup.xml
	WebContent/xmlFiles/Student.xml
	WebContent/xmlFiles/Student.xsd