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~