ECMS-5664 change FriendlyServlet to FriendyFilter
ECMS-5686: IE - XSS on 'select relation' - Content Management
ECMS-5686: IE - XSS on 'select relation' - Content Management

ECMS-5686: IE - XSS on 'select relation' - Content Management
UI-3037 CLONE - Incorrect position of SEO icon, incorrect tooltip of help icon in top menu
ECMS-5664 fix the case for rest url
ECMS-5719 UnsupportedRepositoryOperationException and node with check-in parent is still locked after relogin
ECMS-5759: XSS in Site Explorer/New Content/CSS File
ECMS-5750: Enable DMS Structure should not display by default for all user
Crowdin injections w40 (from 20130928 to 20131004) - Update translations
Crowdin injections w40 - Add Simplified Chinese translations
Crowdin injections w41 (from 20131005 to 20131010)
Crowdin injections w41 - Add Finnish files
ECMS-5751 Use gatein 3.5.8.Final-SNAPSHOT
ECMS-5749: The layout of Site Explorer will be broken when contains a crash file

Conflicts:

	core/webui-explorer/src/main/java/org/exoplatform/ecm/webui/component/explorer/rightclick/manager/DeleteManageComponent.java
ECMS-5749: Resolve config after cherry-pick
Merge remote-tracking branch 'origin/feature/stabilization'

Conflicts:
	core/services/src/main/java/org/exoplatform/services/wcm/friendly/impl/FriendlyFilter.java
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ