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