Bug fixes: ResetPasswordAction.jsp
Merge branch 'master' of https://github.com/basdag/08707
Merge branch 'master' of https://github.com/basdag/08707
Update files: EmployeeDAO.java, Security.java, Global.java, LoginAction.java, CreateUserAction.java, TransitionDayAction.java, ResetPasswordAction.java
Merge conflict solved: transitionDay.jsp