editPwd

This reverts commit 73c59f39a3a610dda060b494d3fe11585e6eb9ab.

editPwd

editPwd && session by 010
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/web.xml
	src/com/iel/hos/actions/UserAction.java
	src/com/iel/hos/dao/UserDao.java
Merge branch 'master' of https://github.com/fengye92/HospitalAssist