Merge remote-tracking branch 'eXoDev/master' into feature/relooking

Conflicts:
	apps/portlet-administration/src/main/resources/locale/portlet/administration/ECMAdminPortlet_fr.xml
	apps/portlet-administration/src/main/resources/locale/portlet/administration/ECMAdminPortlet_pt_BR.properties
	apps/portlet-administration/src/main/resources/locale/portlet/administration/ECMAdminPortlet_vi.xml
	apps/portlet-explorer/src/main/webapp/groovy/webui/component/explorer/control/UIActionBar.gtmpl
	apps/portlet-explorer/src/main/webapp/groovy/webui/component/explorer/control/UIAddressBar.gtmpl
	apps/portlet-explorer/src/main/webapp/groovy/webui/component/explorer/sidebar/UISideBar.gtmpl
	apps/portlet-explorer/src/main/webapp/javascript/eXo/ecm/UIListView.js
	core/webui-administration/src/main/java/org/exoplatform/ecm/webui/component/admin/views/UIViewForm.java
	packaging/wcm/webapp/src/main/resources/locale/wcm/webui_en.xml
	packaging/wcm/webapp/src/main/resources/locale/wcm/webui_fr.xml
	packaging/wcm/webapp/src/main/webapp/WEB-INF/conf/dms-extension/dms/dms-drives-configuration.xml
	packaging/wcm/webapp/src/main/webapp/WEB-INF/conf/dms-extension/dms/dms-views-configuration.xml
	packaging/wcm/webapp/src/main/webapp/WEB-INF/conf/dms-extension/jcr/repository-configuration.xml
	packaging/wcm/webapp/src/main/webapp/WEB-INF/conf/wcm-extension/dms/drives-configuration.xml
	packaging/wcm/webapp/src/main/webapp/WEB-INF/conf/wcm-extension/dms/explorer-views-configuration.xml
	packaging/wcm/webapp/src/main/webapp/WEB-INF/conf/wcm-extension/jcr/repository-configuration.xml
	packaging/wcm/webapp/src/main/webapp/javascript/eXo/ecm/ECMUtils.js
	pom.xml
	testsuite/test/src/main/resources/conf/standalone/jcr/ecms-test-nodetypes-config.xml
ECMS-4195 fix bugs after merging master to relooking