cadrage technique / POC de la zone de Plan
-> premier commit des composants
Merge branch 'sprint_x' of github.com:productys/mes-eworkshop into sprint_x
Merge branch 'sprint_x' of github.com:productys/mes-eworkshop into sprint_x
EW-86 - Création de plans
+ différentes gestions de merge
- getRemovableDto(dadWrapper) passage dans compositeUtil
- Gestion de dad plan vers les pictures
- Modification du composite admin (suprresion de custom component)
- Modification e-Workshop dans le statut
- Rajout de méthodes showNotification dans le controlleur
- Création d'un cobjet CompositeFakeBuilder.java pour gérer les créations de fausse données
- Rajout d'un addon pour gérer des calculs de pp css venant du client
EW-86 - Création de plans
Merge branch 'sprint_x' of github.com:productys/mes-eworkshop into sprint_x

Conflicts:
	eworkshop/eworkshop-admin-poc/.classpath
	eworkshop/eworkshop-admin-poc/.settings/org.eclipse.core.resources.prefs
	eworkshop/eworkshop-admin-poc/src/main/java/com/productys/poc/composite/eworkshop/composite/GarbageComposite.java
	eworkshop/eworkshop-admin-poc/src/main/java/com/productys/poc/composite/eworkshop/composite/MediaComposite.java
	eworkshop/eworkshop-admin-poc/src/main/java/com/productys/poc/composite/eworkshop/composite/PictureComposite.java
	eworkshop/eworkshop-admin-poc/src/main/java/com/productys/poc/composite/eworkshop/composite/PictureZoneComposite.java
	eworkshop/eworkshop-admin-poc/src/main/java/com/productys/poc/controller/PocAdminController.java
	eworkshop/eworkshop-admin/src/main/java/com/productys/eworkshop/ui/controller/AdminAppController.java
	eworkshop/eworkshop-composite/.classpath
	eworkshop/eworkshop-composite/src/main/java/com/productys/eworkshop/controller/IAdminController.java
	eworkshop/eworkshop-composite/src/main/java/com/productys/eworkshop/exception/EworkshopClientException.java
	eworkshop/eworkshop-composite/src/main/java/com/productys/eworkshop/util/CompositeUtil.java
	eworkshop/eworkshop-fo-poc/.settings/org.eclipse.wst.common.component
Merge branch 'sprint_x' of github.com:productys/mes-eworkshop into sprint_x (2)