error
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/forgetpwd/controller/ForgetPwdServlet.java
	src/com/forgetpwd/model/SendResetPwdEmail.java
Merge branch 'master' of https://github.com/cecj06googo/Googo