ECMS-4409 New folder in Content Explorer
ECMS-4522 Folder types in drive edit screen are not in alphabetic order
Merge remote-tracking branch 'eXoDev/master' into feature/file-management-view

Conflicts:
	apps/portlet-explorer/src/main/resources/locale/portlet/explorer/JCRExplorerPortlet_pt_BR.properties