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

Conflicts:
	WebRoot/js/homepage.js
	WebRoot/messager.jsp