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