Merge branch 'master' into feature/stabilization
ECMS-6189 remove log of scripts when migrating script data to make sure scripts will be imported later
ECMS-6189 remove log of scripts when migrating script data to make sure scripts will be imported later
ECMS-5598 Data initialization policies are not consistent among services

Conflicts:
	core/services/src/main/java/org/exoplatform/services/cms/views/impl/ApplicationTemplateManagerServiceImpl.java
	core/services/src/main/java/org/exoplatform/services/cms/views/impl/ManageViewPlugin.java
	core/webui-administration/src/main/java/org/exoplatform/ecm/webui/component/admin/metadata/UIMetadataList.java
ECMS-5598 Data initialization policies are not consistent among services

Conflicts:
	core/services/src/main/java/org/exoplatform/services/cms/views/impl/ApplicationTemplateManagerServiceImpl.java
	core/services/src/main/java/org/exoplatform/services/cms/views/impl/ManageViewPlugin.java
	core/webui-administration/src/main/java/org/exoplatform/ecm/webui/component/admin/metadata/UIMetadataList.java
ECMS-6096 fix UI error when switching to edit mode
ECMS-6096 fix UI error when switching to edit mode
COMMONS-309 fix the way to create document object in FileUploadHandler
COMMONS-309 fix the way to create document object in FileUploadHandler
ECMS-5878 In WCMPublicationDeploymentPlugin only publish the node itself but its children
ECMS-5878 In WCMPublicationDeploymentPlugin only publish the node itself but its children
UI-3270: ECMS - Incorrect color of icons in Content Administration and Site Explorer
pt-BR injection on 20140522-092858
sq injection on 20140522-092858
zh-TW injection on 20140522-092858
cs injection on 20140522-092858
uk injection on 20140522-092858
ECMS-6046 catch the case of ArrayIndexOutOfBoundsException
ECMS-6046 catch the case of ArrayIndexOutOfBoundsException
Revert "ECMS-4374 CLONE - Investigate ECMS performance on community website- Remove the usage of download server as much as possible, use DownloadConnector instead."

This reverts commit de8df98c9a621263c0d306ca68fde2ed647b9a93.

Conflicts:
	core/webui/src/main/java/org/exoplatform/ecm/webui/utils/Utils.java
	core/webui/src/main/java/org/exoplatform/wcm/webui/Utils.java