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-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
COMMONS-309 fix the way to create document object in FileUploadHandler
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
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
ECMS-6157 restore core/webui/src/main/java/org/exoplatform/ecm/webui/utils/Utils.getDownloadRestServiceLink
PLF-5937 Update pom version of version kernel | core | jcr | ws to be compliant with snapshot 4.1
zh-TW injection on 20140528-004841
UI-3295: Two Icon delete old and new overlap
ECMS-6227 | ECMS-6227  Improve code on template of file UIToolbarContainer.gtmpl
ECMS-6265: SitesExplorer Tree disappears

Problem analysis
- Refreshing Explorer frame causes wrong updating current tab in Side Bar

Fix description
- Only refesh Explorer frame by ajax