all tables ready
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
commit before checkout master
Doing GroMngHome Page
complete newProject page
Merge remote-tracking branch 'origin/development'

Conflicts:
	ProjMgmtSys/WebContent/WEB-INF/jsp/adminHome.jsp
	ProjMgmtSys/WebContent/WEB-INF/jsp/deptMngHome.jsp
	ProjMgmtSys/WebContent/WEB-INF/jsp/groMngHome.jsp
	ProjMgmtSys/WebContent/WEB-INF/jsp/newProject.jsp
	ProjMgmtSys/build/classes/com/ProjMgmtSys/controller/UserController.class
Complete all front end work, add Yongming's manager file and sessionfactory files
finish merge
create dept done
display response of new dept done
finished creating new employee function
unblock user done
Merge remote-tracking branch 'tuyue/develop'

Conflicts:
	ProjMgmtSys/WebContent/WEB-INF/jsp/adminHome.jsp
	ProjMgmtSys/WebContent/resources/js/jsfunc.js
	ProjMgmtSys/src/com/ProjMgmtSys/model/Dept/DeptManager.java
merge modifyDept and unblock with Tuyue's newEmp, also fix some part in Tuyue's code
finished changing password
finished merging with shihuan
new group and modifyGroup done
before merge
finish merge