route
ajout parsage socket
Ajout de trucs
Merge branch 'feature/php_socket_2' of https://github.com/H4412/GHOME into feature/php_socket_2
avancement dans les features
Merge branch 'feature/php_socket_2' of github.com:H4411/GHOME into feature/php_socket_2
Modifs du parsage
Merge branch 'feature/php_socket_2' of https://github.com/H4412/GHOME into feature/php_socket_2
Merge branch 'feature/php_socket_2' of github.com:H4411/GHOME into feature/php_socket_2
Merge branch 'feature/managerDashboard' into develop

Conflicts:
	src/Ghome/PompierBundle/Entity/Intervention.php
	src/Ghome/PompierBundle/Entity/Intervention.php~
	src/Ghome/PompierBundle/Entity/User.php
	src/Ghome/PompierBundle/Entity/User.php~
	src/Ghome/PompierBundle/Resources/config/doctrine/User.orm.yml
	src/Ghome/PompierBundle/Resources/config/routing.yml