Corrected angularjs route
supp methode redondante
Merge branch 'develop' of https://github.com/H4412/GHOME into develop

Conflicts:
	src/Ghome/PompierBundle/Controller/SocketController.php
mise à plat
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
Merge branch 'feature/admin_dashboard' into develop
Merge branch 'develop' of github.com:H4411/GHOME into feature/php_socket_3

Conflicts:
	src/Ghome/PompierBundle/Entity/Gps.php~
	src/Ghome/PompierBundle/Entity/Interruptor.php~
	src/Ghome/PompierBundle/Entity/Movement.php~
	src/Ghome/PompierBundle/Entity/Temperature.php~