1）忘记密码模块
2）我的博客无博客时显示提示

Signed-off-by: An <lasdtc@gmail.com>
Merge branch 'master' of https://github.com/zhengjiabin/ISharing.git

Conflicts:
	WebRoot/WEB-INF/classes/com/ISharing/Action/ResourceAction.class
	WebRoot/tech_cyclopedia.jsp

Signed-off-by: An <lasdtc@gmail.com>