EW-84 - BO - Client - Popup configuration - onglet aptitudes
 Integration composant sur l'admin
Merge branch 'composite' of https://github.com/productys/mes-eworkshop into composite

Conflicts:
	eworkshop/eworkshop-admin/WebContent/VAADIN/themes/eworkshopTheme/styles.css