Signed-off-by: Ashel <475308724@qq.com>
Merge branch 'NEW-MASTER' of https://github.com/zhengjiabin/ISharing.git into NEW-MASTER

Conflicts:
	WebRoot/WEB-INF/classes/com/ISharing/Action/SearchAction.class
	src/com/ISharing/Action/SearchAction.java