Merge branch 'master' into feature/stabilization
PLF-6082 Upgrade version of maven-parent-pom to 14-SNAPSHOT
Merge branch 'master' into feature/stabilization
Merge branch 'feature/stabilization'
Use maven-parent-pom 14
SWF-3078: Let's start 4.2.x developments
CAL-998 [PLF41-Migration]Missing color of calendars created in Platform 3.5
UI-3456: MSOffice Icons
Merge branch 'develop' into feature/skin-module

Conflicts:
	platform-ui-skin/src/main/webapp/skin/less/Core.less
	platform-ui-web-eXoResources/pom.xml
	platform-ui-webui-core/pom.xml
	pom.xml