Update: SearchUserAction.java, searchUser.jsp, resetPassword.jsp, requestCheck.jsp
Merge conflict solved: transactionHistory.jsp, researchFund.jsp
Confirming last comit
Merge conflict solved
Merge branch 'master' of https://github.com/basdag/08707