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

Conflicts:
	WebRoot/QA.jsp
	WebRoot/QA_Answer.jsp
Merge branch 'master' of https://github.com/zhengjiabin/ISharing.git
tags better and image file input
Signed-off-by: PacoIrene <zhenyangchu@gmail.com>