encode changed
Merge commit '0410cd96a9c8d13ac7c3264d35fcde8a14681b80'

Conflicts:
	JNUSocialNetwork/WebContent/pages/aboutUs.jsp
	JNUSocialNetwork/WebContent/pages/assets/postID.json
	JNUSocialNetwork/WebContent/pages/js/activity.js
	JNUSocialNetwork/src/security/helper/UAgentInfo.java
Merge branch 'master' into scottDev
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
Merge branch 'master' into scottDev
修复检测电话漏洞
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
Merge branch 'master' into scottDev
修改登记电话部分
Merge branch 'scottDev'