début mise en place module angular mais erreur de type injector moduler
Corrected syntax and pathing errors
commit pour mettre en commun routing
récup_iid_current_user
affichage des infos récupérées côté manager
motifs récentes
Merge branch 'feature/map_integration' into develop
Merge branch 'feature/récupInfosHTTP' of github.com:H4411/GHOME into feature/récupInfosHTTP
Merge branch 'feature/récupInfosHTTP' into develop

Conflicts:
	src/Ghome/PompierBundle/Controller/SocketController.php
	src/Ghome/PompierBundle/Resources/config/routing.yml
	src/Ghome/PompierBundle/Resources/views/layout.html.twig
Corrected angularjs route
socket persistance
supp methode redondante
Merge branch 'develop' of https://github.com/H4412/GHOME into develop

Conflicts:
	src/Ghome/PompierBundle/Controller/SocketController.php
mise à plat
persitance et envoie de JSON OK
Added form edition and dashboard
Merge branch 'develop' of github.com:H4411/GHOME into develop
working on dashboard
Added user inside dashboard.
Added entity Capteur to store the unique id of each received data. Added Capteur to our dashboard