add stuff
Merge branch 'master' of https://github.com/Flavien69/TP-JSF-WebAppCustom

Conflicts:
	src/step4/model/RecipeModelBean.java
	src/step4/processing/RecipeControlerBean.java