实现找回密码
Merge branch 'master' of git@github.com:zhengjiabin/ISharing.git

Conflicts:
	WebRoot/WEB-INF/applicationContext.xml
	WebRoot/WEB-INF/classes/com/ISharing/Action/UserAction.class
	WebRoot/WEB-INF/classes/struts.xml
	src/com/ISharing/Action/UserAction.java
	src/struts.xml