Signed-off-by: ZhongLing <kevin6132919@163.com>
Merge branch 'master' of git@github.com:zhengjiabin/ISharing.git

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	src/com/ISharing/Filter/UserLoginFilter.java