foodcategory ang flavour restfulservice
Merge branch 'develop' of
https://github.com/PracticalTraining/nourriture into develop

Conflicts:
	source/server/nourriture-web/src/main/webapp/WEB-INF/applicationContext.xml
Merge branch 'develop' of https://github.com/PracticalTraining/nourriture into develop
foodcategory and flavour restfulservice without test