My work
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ProjMgmtSys/.classpath
	ProjMgmtSys/.project
	ProjMgmtSys/.settings/org.eclipse.wst.common.component
	ProjMgmtSys/.settings/org.eclipse.wst.common.project.facet.core.xml
	ProjMgmtSys/WebContent/WEB-INF/jsp/adminHome.jsp
	ProjMgmtSys/WebContent/WEB-INF/jsp/deptMngHome.jsp
	ProjMgmtSys/WebContent/WEB-INF/jsp/groMngHome.jsp
	ProjMgmtSys/build/classes/com/ProjMgmtSys/configuration/hibernate.cfg.xml
	ProjMgmtSys/build/classes/com/ProjMgmtSys/model/User/User.hbm.xml
	ProjMgmtSys/src/com/ProjMgmtSys/configuration/hibernate.cfg.xml
	ProjMgmtSys/src/com/ProjMgmtSys/model/User/User.hbm.xml