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

Conflicts:
	WebRoot/QA.jsp

Signed-off-by: zhengjiabin <zhengjiabin.tj@gmail.com>