Changed architecture for EJB
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
Necessary for file upload
Changes for dropbox
Dropbox changes
Changes for file upload
Changed directory structure
local commit
Merge branch 'master' of https://github.com/nehachoudhari/DigitalYearbook

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.project.facet.core.xml
Department
Changes for error fixing
error fixes
Merge branch 'master' into nehas

Conflicts:
	.classpath
	.gitignore
	.settings/org.eclipse.wst.common.project.facet.core.xml
	WebContent/addDepartment.xhtml
	bin/bean/CommitteeMember.class
	bin/bean/Department.class
	bin/bean/Photograph.class
	bin/bean/ResearchGroup.class
	bin/bean/Student.class
	src/bean/CommitteeMember.java
	src/bean/Department.java
	src/bean/Photograph.java
	src/bean/ResearchGroup.java
	src/bean/Student.java