基本没改

Signed-off-by: An <lasdtc@gmail.com>
Merge branch 'master' of https://github.com/zhengjiabin/ISharing.git
1）在资源界面加侧边栏
2）整理合并资源系统的侧边栏
3）优化文件上传模块交互

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

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	WebRoot/tech_cyclopedia.jsp

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