Merge branch 'master' into feature/stabilization
Crowdin injection w16 (from 20140412 to 20140416)
WIKI-890: [Iframe] Impossible to add attachment to wiki page

Fix description:
- Avoid access main page in case of iframe
WIKI-875: [integ-wiki] HTML encoding of comments

Fix description:
- don't escape html in synchronized function
- escape html when get comment in UIWikiPageVersionsList template
WIKI-863 Spelling mistake in Children macro
WIKI-853: [Cloud] No content in Wiki syntax help (Edit source mode)

Analysis:
* Only the first tenant that accesses Wiki can have wiki syntax help panel.
* Once the Syntax Help panel displays, the help content is stored in DB. It no longer depends on "first tenant access" context.
* WikiServiceImpl uses an Iterator object to generate help page for wiki.
  This Iterator object will be empty from the second time (because the last element was already accessed)

Fix description
* Improve WikiServiceImpl to support multi-tenancy by itself
* Use List type instead of Iterator
WIKI-846: [Advanced Search] Wiki Page's content inside Search Result

Problem analysis:
* WIKI-748 changes the indexing configuration for Wiki Page's content.
  The indexation and then searching is done inside Wiki Page's content instead of the whole Wiki Page node.
  When the keyword is found in Wiki Page's content, the result is therefore a wiki:attachment.

Fix description:
* Handle correctly the excerpt when the result is a Wiki Page's content.

Conflicts:
	wiki-service/src/main/java/org/exoplatform/wiki/service/impl/JCRDataStorage.java
WIKI-844: Cannot open wiki page when wiki portlet locates in new site

Fix description:
* Rebuild the correct page link in UITreeExplorer.

Conflicts:
	wiki-webui/src/main/java/org/exoplatform/wiki/commons/Utils.java
WIKI-834: Loading forever of Tree navigation when wiki page is made public

Fix description:
* Make getTreeData REST service available for public.
WIKI-832: Page not found when open a wiki page from activity stream after quick edit its title

Fix description: set URL for page after renaming its title inline
WIKI-830: Alert message is posted when adding Wiki portlet to a site

Problem:
- This is a side effect from WIKI-380

Fix description:
- Remove useless script block in UIWikiPortlet.gtmpl
- Add a condition to get the function fixLinksTargetAttribute in UIWikiContentDisplay.gtmpl
WIKI-825: Warning message during startup about wrong xml configuration files

Fix description:
* Update the path of configuration files.
WIKI-793: Wrong behavior when creating page without title

Problem analysis:
* This is a side effect from WIKI-523. Autosaving is enabled before opening the confirmation pop-up

Fix description:
* Disable the autosaving before rendering the confirmation pop-up
WIKI-769 Wiki syntax error

Fix description:
- Fix the problem of display list style type when previewing and saving by using xwiki syntax of list
- Fix the problem of display list style type when using list syntax with style define by mandatory
- Fix the problem of display list style in RichTextArea.
WIKI-489: Escape single quote in Confirmation Messages
WIKI-519 Broken PageContentArea after unfolding a page from pagetree macro
WIKI-593 Invalid percent escape for page with national name
Revert "WIKI-769 Wiki syntax error"

This reverts commit 09c6bf19f64f9d3612e72ff9d8114438347b3a59.
Merge branch 'feature/stabilization'
Merge branch 'master' into feature/social-notifications