Merge branch 'master' into feature/stabilization
ECMS-5959 [IE9] Syntax error shown when clicking on page number
ECMS-6012 Intranet homepage become blank in the case shared site doesn't exist
ECMS-5994: [IE8][Content Admin] Impossible to delete a comment for a node
ECMS-5956: [ECMAdmin] UI error when searching a node type in draft

Fix description:
* Remove the description column when Node Type is saved as draft
* Update span type to increase the column width
ECMS-5880 [CLV] Missing scroll bar in Search Result tab
ECMS-5868: CLONE - Uploaded groovy file is neither recognized nor editable

Fix description:
  -  add groovy, gtmpl, grs to the authorized mimetype
ECMS-5827 Unused wcm.composer cache always instantiated in service
ECMS-5800 in configuation, change attribute 'protected' of exo:script and exo:scriptLabel properties of all action node type to 'false'
ECMS-5800 change attribute 'protected' of exo:script and exo:scriptLabel properties of all action node type to 'false'
ECMS-5755 add padding-bottom for ActionContainer div
ECMS-5518 [Content Explorer] Should keep current page after copy

Conflicts:
	core/webui-explorer/src/main/java/org/exoplatform/ecm/webui/component/explorer/rightclick/manager/PasteManageComponent.java
[CLV] Weird help tooltips of setting options
Problem analysis
* These tooltips have double quotes which are considered as ending marks in HTML title attribute.

Fix description:
* Escape the double quotes before assigning to HTML title attribute
ECMS-5734: [ECMAdmin] NPE when canceling the modification of a category tree

Fix description:
  - restore the Reset button for category tree
ECMS-5682 when the clicked page is empty, return to the previous pages util meet an unempty page
UI-3200 Incorrect position of checkbox in Set up browsing Preferences in some languages (Vietnamese, German)
ECMS-5862 [TC-4.0.4] [Intranet Home Page] Slowness in clv.UICLVPortlet invocation

Conflicts:
	apps/portlet-presentation/src/main/java/org/exoplatform/wcm/webui/clv/UICLVPresentation.java
	apps/portlet-presentation/src/main/webapp/groovy/ContentListViewer/UICLVContainer.gtmpl
ECMS-5819: CLONE - Error showing PDF file in a linked detail page

Fix description:
  - Check the validity of jcr:lastModified before access to the property
ECMS-5819: CLONE - Error showing PDF file in a linked detail page

Fix description:
  - Separate redundant code into a public function of Utils

Conflicts:
	core/services/src/main/java/org/exoplatform/services/cms/impl/Utils.java
ECMS-5911 [PLF40-Migration] Failed to Add Translation after the migration from Platform 3.5

Fix description
* Change the way to get locale