Update file: CreateUser.java, Controller.java, create-user.jsp & Add file: ResetPassword.java, DepositCheck.java
Merge conflict fixed