Save
Save
Added logo
Added logo
Merge branch 'master' into Dev_Sony

Conflicts:
	node_modules/connect/lib/public/icons/Thumbs.db
	start.js
Added conection to mongodb in controller
Removed hello.js
Ajout Diagrame.pub
Add controllerCore, cacheService, first view and templateService
comment service_bis fonctionnalities
sauvegarde
Merge branch 'Dev_Jonathan' into Dev_Sony

Conflicts:
	controllers/controller.js
	controllers/homeController.js
	node_modules/connect/lib/public/icons/Thumbs.db
	server.js
	services/contextService.js
	services/requestService.js
	services/templateService.js
	start.js
Nettoyage et changement de l'objet contexte
Modif contexte
modif pour fonctionnement en prod
suppression start.js
Merge branch 'Dev_Sony' into Dev_Jonathan

Conflicts:
	controllers/controller.js
	controllers/homeController.js
Merge avec dev_sony
Ajout de style