Modèle de données concordant avec celui de GenMyModel
Merge branch 'api' of https://github.com/BodyWired/Bodywired into api
Merge branch 'api' of https://github.com/BodyWired/Bodywired into api

Conflicts:
	API/src/main/java/org/bodywired/api/controller/AlimentController.java
	API/src/main/java/org/bodywired/api/service/NutritionService.java
	API/src/main/java/org/bodywired/api/service/impl/NutritionServiceImpl.java