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

Conflicts:
	WebRoot/js/QA_Answer.js

Signed-off-by: PacoIrene <zhenyangchu@gmail.com>