EW-54 BO - Affichage des catégories (zone 4)
Merge branch 'master' of https://github.com/productys/eworkshop-poc

Conflicts:
	.settings/com.vaadin.integration.eclipse.prefs
	src/com/productys/poc/EworkshopApplicationPoc.java