EW-57 - BO - Client - Popup de configuration
Merge branch 'master' of https://github.com/productys/mes-eworkshop

Conflicts:
	eworkshop/eworkshop-admin/src/main/java/com/productys/eworkshop/ui/controller/AdminAppController.java