Merge branch 'master' into feature/stabilization
Crowdin injection w16 - Add Ukrainian files on 20140416
FORUM-808 | [Answers] "Failed to save category error" when creating new space
FORUM-853 | [Forum] Activity is not updated after approving a censored post in topic
INTEG-299: [integ-ecms] HTML encoding of comments from Content Explorer

Fix description:
  - Remove HTML tag of comments when showing to activity stream
INTEG-298: Possible to comment on topic activity although topic or its forum is locked/closed

Fix description:
- Modify method: getTopic() in ForumUIActivity.java because the topic had been get from DataStorage not from ForumService. So it doesn't use eXoCache => Raise problem about performance.
- Add new boolean function to check if forum/topic in status Lock or Close.

Conflicts:
	integ-forum/integ-forum-social/src/main/java/org/exoplatform/forum/ext/impl/ForumUIActivity.java
INTEG-295: Unified Search failed when Platform runs inside an IFrame

Fix description
- Correct the way to get portal name by local javascript object
INTEG-291: [Activity Stream] Incorrect thumbnail image of Powerpoint files shared via Activity Composer

Problem analysis:
* Powerpoint files are recognized as normal file without thumbnail view support.

Fix description:
* Use ECMS method to check whether the MIME type supports thumbnail view.

Conflicts:
	integ-social/integ-social-ecms/src/main/resources/groovy/social/plugin/doc/UIDocActivity.gtmpl
INTEG-289: [Security] Detail of question in FORUM has XSS vulnerability

Fix description:
* Revert the previous commit (c0b9f0437) which cleans the whole scripts inside activity content
* Use activity body (XSS vulnerability has been handled) for activity content.

Conflicts:
	integ-forum/integ-forum-social/src/main/resources/groovy/forum/social-integration/plugin/space/AnswerUIActivity.gtmpl
INTEG-288: "Description" field in Metadata has XSS vulnerability in Activity Stream

Fix description:
  - Escape XSS character of description when rendering in the Activity Stream

Conflicts:
	integ-ecms/integ-ecms-social/src/main/resources/groovy/ecm/social-integration/plugin/space/FileUIActivity.gtmpl
Revert "INTEG-298: Possible to comment on topic activity although topic or its forum is locked/closed"

This reverts commit bcbd92797d112dc40e8d781b4071bf3dbb6bb7a5.
INTEG-298: Possible to comment on topic activity although topic or its forum is locked/closed

Fix description:
- Modify method: getTopic() in ForumUIActivity.java because the topic had been get from DataStorage not from ForumService. So it doesn't use eXoCache => Raise problem about performance.
- Add new boolean function to check if forum/topic in status Lock or Close.

Conflicts:
	integ-forum/integ-forum-social/src/main/java/org/exoplatform/forum/ext/impl/ForumUIActivity.java
INTEG-268 [Unified Search] Answer icon is too small in Floating Suggestion

Fix description: update answer icon.
INTEG-263 [Unified Search] Can not show result if keyword contains character * at begin

Fix description:
- Escape keyword in quick search portlet
INTEG-181: XSS vulnerability on Quick Search box

Fix description:
	- Escape HTML script by XSSUtils implemented in COMMONS-312 before rendering
INTEG-308 [Poll] XSS vulnerability of Poll options

Fix description:
* Skip the decoding of "less than" and "greater than" characters which are used in XSS scripts.
  Such scripts cannot execute then.
INTEG-287: When moving a question, it's activity should also be moved

Signed-off-by: ayoub zayati <ayoub.ezzayati@exoplatform.com>

Conflicts:

	integ-forum/integ-forum-social/src/main/java/org/exoplatform/forum/ext/impl/AnswersSpaceActivityPublisher.java
Merge branch 'feature/stabilization'
Merge branch 'master' into feature/social-notifications